luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 17:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdbus: Avoid printing null strings

Browse Source 
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);
      |
This commit is contained in:
Ernestas Kulik 2019-01-29 09:50:46 +01:00
parent 08e5c89dfc
commit 566e1d61a5
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gdbusauth.c
View File

@ -1272,9 +1272,9 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
&line_length, &line_length,
cancellable, cancellable,
error); error);
debug_print ("SERVER: WaitingForBegin, read '%s'", line);
if (line == NULL) if (line == NULL)
goto out; goto out;
debug_print ("SERVER: WaitingForBegin, read '%s'", line);
if (g_strcmp0 (line, "BEGIN") == 0) if (g_strcmp0 (line, "BEGIN") == 0)
{ {
/* YAY, done! */ /* YAY, done! */

5
gio/gdbusmessage.c
View File

@ -2731,7 +2731,6 @@ g_dbus_message_to_blob (GDBusMessage *message,
if (message->body != NULL) if (message->body != NULL)
{ {
gchar *tupled_signature_str; gchar *tupled_signature_str;
tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
if (signature == NULL) if (signature == NULL)
{ {
g_set_error (error, g_set_error (error,
@ -2739,10 +2738,10 @@ g_dbus_message_to_blob (GDBusMessage *message,
G_IO_ERROR_INVALID_ARGUMENT, G_IO_ERROR_INVALID_ARGUMENT,
_("Message body has signature “%s” but there is no signature header"), _("Message body has signature “%s” but there is no signature header"),
signature_str); signature_str);
g_free (tupled_signature_str);
goto out; 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_set_error (error,
G_IO_ERROR, G_IO_ERROR,