Mercurial > mxe-octave
changeset 5123:ed74d76248b7
* src/glib-1-fixes.patch: update glib patch so will compile with gcc 9.1.0
author | John Donoghue |
---|---|
date | Tue, 16 Jul 2019 15:54:05 -0400 |
parents | 8c37a632b348 |
children | e4a0b11c5cc5 |
files | src/glib-1-fixes.patch |
diffstat | 1 files changed, 62 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/glib-1-fixes.patch Mon Jul 15 08:31:51 2019 -0400 +++ b/src/glib-1-fixes.patch Tue Jul 16 15:54:05 2019 -0400 @@ -641,3 +641,65 @@ #ifdef G_OS_WIN32 g_type_ensure (_g_winhttp_vfs_get_type ()); #endif + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik <ekulik@redhat.com> +Date: Tue, 29 Jan 2019 09:50:46 +0100 +Subject: [PATCH 10/10] gdbus: Avoid printing null strings + +This mostly affects the 2.56 branch, but, given that GCC 9 is being +stricter about passing null string pointers to printf-like functions, it +might make sense to proactively fix such calls. + +gdbusauth.c: In function '_g_dbus_auth_run_server': +gdbusauth.c:1302:11: error: '%s' directive argument is null +[-Werror=format-overflow=] + 1302 | debug_print ("SERVER: WaitingForBegin, read '%s'", + line); + | + +gdbusmessage.c: In function ‘g_dbus_message_to_blob’: +gdbusmessage.c:2730:30: error: ‘%s’ directive argument is null [-Werror=format-overflow=] + 2730 | tupled_signature_str = g_strdup_printf ("(%s)", signature_str); + | + +diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c +index 1111111..2222222 100644 +--- a/gio/gdbusauth.c ++++ b/gio/gdbusauth.c +@@ -1295,9 +1295,9 @@ _g_dbus_auth_run_server (GDBusAuth *auth, + &line_length, + cancellable, + error); +- debug_print ("SERVER: WaitingForBegin, read '%s'", line); + if (line == NULL) + goto out; ++ debug_print ("SERVER: WaitingForBegin, read '%s'", line); + if (g_strcmp0 (line, "BEGIN") == 0) + { + /* YAY, done! */ +diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c +index 1111111..2222222 100644 +--- a/gio/gdbusmessage.c ++++ b/gio/gdbusmessage.c +@@ -2695,7 +2695,6 @@ g_dbus_message_to_blob (GDBusMessage *message, + if (message->body != NULL) + { + gchar *tupled_signature_str; +- tupled_signature_str = g_strdup_printf ("(%s)", signature_str); + if (signature == NULL) + { + g_set_error (error, +@@ -2703,10 +2702,10 @@ g_dbus_message_to_blob (GDBusMessage *message, + G_IO_ERROR_INVALID_ARGUMENT, + _("Message body has signature '%s' but there is no signature header"), + signature_str); +- g_free (tupled_signature_str); + goto out; + } +- else if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0) ++ tupled_signature_str = g_strdup_printf ("(%s)", signature_str); ++ if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0) + { + g_set_error (error, + G_IO_ERROR,