[OE-core] [sumo][PATCH v2 3/4] glib-2.0: Add patch from upstream to fix build with host gcc9
Andreas Müller
schnitzeltony at gmail.com
Tue Sep 24 12:08:47 UTC 2019
Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
---
...11-gdbus-Avoid-printing-null-strings.patch | 77 +++++++++++++++++++
meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb | 1 +
2 files changed, 78 insertions(+)
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0011-gdbus-Avoid-printing-null-strings.patch
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0011-gdbus-Avoid-printing-null-strings.patch b/meta/recipes-core/glib-2.0/glib-2.0/0011-gdbus-Avoid-printing-null-strings.patch
new file mode 100644
index 00000000000..19085d0b789
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0011-gdbus-Avoid-printing-null-strings.patch
@@ -0,0 +1,77 @@
+From 566e1d61a500267c7849ad0b2552feec9c9a29a6 Mon Sep 17 00:00:00 2001
+From: Ernestas Kulik <ekulik at redhat.com>
+Date: Tue, 29 Jan 2019 09:50:46 +0100
+Subject: [PATCH] gdbus: Avoid printing null strings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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);
+ |
+
+Upstream-Status: Accepted
+
+[1] https://gitlab.gnome.org/GNOME/glib/commit/566e1d61a500267c7849ad0b2552feec9c9a29a6
+
+Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
+---
+ gio/gdbusauth.c | 2 +-
+ gio/gdbusmessage.c | 5 ++---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c
+index 1f8ea8057..752ec23fc 100644
+--- a/gio/gdbusauth.c
++++ b/gio/gdbusauth.c
+@@ -1272,9 +1272,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 3221b925d..3a1a1f9e9 100644
+--- a/gio/gdbusmessage.c
++++ b/gio/gdbusmessage.c
+@@ -2731,7 +2731,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,
+@@ -2739,10 +2738,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,
+--
+2.21.0
+
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
index faf594569d6..35fd86819bf 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
@@ -16,6 +16,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://0001-Do-not-ignore-return-value-of-write.patch \
file://0001-Test-for-pthread_getname_np-before-using-it.patch \
file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
+ file://0011-gdbus-Avoid-printing-null-strings.patch \
"
SRC_URI_append_class-native = " file://relocate-modules.patch"
--
2.21.0
More information about the Openembedded-core
mailing list