Attachment 86081 Details for Bug 69542 – 01/10] Flag printf-ish functions with G_GNUC_PRINTF and fix resulting warnings

[patch] 01/10] Flag printf-ish functions with G_GNUC_PRINTF and fix resulting warnings

0001-Flag-printf-ish-functions-with-G_GNUC_PRINTF-and-fix.patch (text/plain), 3.80 KB, created by Simon McVittie on 2013-09-18 18:46:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-09-18 18:46:08 UTC

Size: 3.80 KB

patch

obsolete

>From d262a6fee083625b24b56142f6d4baa2dbd7e64a Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 18 Sep 2013 14:07:57 +0100
>Subject: [PATCH 01/10] Flag printf-ish functions with G_GNUC_PRINTF and fix
> resulting warnings
>
>In particular, mcd-account-manager-default could crash when migrating
>an account, since it would dereference arbitrary stack contents
>as a pointer-to-string.
>---
> src/mcd-account-manager-default.c | 3 ++-
> src/mcd-account.c                 | 2 +-
> src/mcd-connection.c              | 2 +-
> src/mcd-debug.h                   | 2 +-
> src/mcd-dispatcher.c              | 2 +-
> tests/account-store.c             | 4 ++--
> 6 files changed, 8 insertions(+), 7 deletions(-)
>
>diff --git a/src/mcd-account-manager-default.c b/src/mcd-account-manager-default.c
>index e73fca1..0a89fe1 100644
>--- a/src/mcd-account-manager-default.c
>+++ b/src/mcd-account-manager-default.c
>@@ -343,7 +343,8 @@ _list (const McpAccountStorage *self,
> 
>           if (_commit (self, am, NULL))
>             {
>-              DEBUG ("Migrated %s to new location: deleting old copy");
>+              DEBUG ("Migrated %s to new location: deleting old copy",
>+                  old_filename);
>               if (g_unlink (old_filename) != 0)
>                 g_warning ("Unable to delete %s: %s", old_filename,
>                     g_strerror (errno));
>diff --git a/src/mcd-account.c b/src/mcd-account.c
>index 77b6153..52bad97 100644
>--- a/src/mcd-account.c
>+++ b/src/mcd-account.c
>@@ -2673,7 +2673,7 @@ apply_parameter_updates (McdAccount *account,
>         g_hash_table_iter_init (&iter, dbus_properties);
>         while (g_hash_table_iter_next (&iter, &name, &value))
>         {
>-            DEBUG ("updating parameter %s", name);
>+            DEBUG ("updating parameter %s", (const gchar *) name);
>             _mcd_connection_update_property (priv->connection, name, value);
>         }
>     }
>diff --git a/src/mcd-connection.c b/src/mcd-connection.c
>index 1e5955a..1d71da4 100644
>--- a/src/mcd-connection.c
>+++ b/src/mcd-connection.c
>@@ -705,7 +705,7 @@ connection_should_reconnect (TpConnection *tp_conn,
>         {
>         case TP_DBUS_ERROR_NAME_OWNER_LOST:
>             /* CM crashed */
>-            DEBUG ("dbus error code: OWNER_LOST, reconnecting", code);
>+            DEBUG ("dbus error code: OWNER_LOST, reconnecting");
>             return TRUE;
>         }
>     }
>diff --git a/src/mcd-debug.h b/src/mcd-debug.h
>index f91e69d..6cd9e08 100644
>--- a/src/mcd-debug.h
>+++ b/src/mcd-debug.h
>@@ -70,7 +70,7 @@ static inline gint _mcd_debug_get_level (void)
> 
> void mcd_debug_print_tree (gpointer obj);
> 
>-void mcd_debug (const gchar *format, ...);
>+void mcd_debug (const gchar *format, ...) G_GNUC_PRINTF (1, 2);
> 
> G_END_DECLS
> 
>diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
>index caa7007..5fea7f2 100644
>--- a/src/mcd-dispatcher.c
>+++ b/src/mcd-dispatcher.c
>@@ -2051,7 +2051,7 @@ try_delegating (ChannelToDelegate *to_delegate)
>             g_strdup (mcd_channel_get_object_path (to_delegate->channel)),
>             v);
> 
>-        DEBUG ("...but failed to delegate it: %s",
>+        DEBUG ("...but failed to delegate %s: %s",
>             mcd_channel_get_object_path (to_delegate->channel),
>             to_delegate->error->message);
> 
>diff --git a/tests/account-store.c b/tests/account-store.c
>index 75860d8..4482ea5 100644
>--- a/tests/account-store.c
>+++ b/tests/account-store.c
>@@ -83,7 +83,7 @@ const Backend backends[] = {
> };
> 
> static void usage (const gchar *name, const gchar *fmt,
>-    ...) G_GNUC_NORETURN;
>+    ...) G_GNUC_NORETURN G_GNUC_PRINTF (2, 3);
> 
> int main (int argc, char **argv)
> {
>@@ -102,7 +102,7 @@ int main (int argc, char **argv)
>   g_set_application_name (argv[0]);
> 
>   if (argc < 3)
>-    usage (argv[0], "");
>+    usage (argv[0], "Not enough arguments");
> 
>   op_name = argv[1];
>   backend = argv[2];
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 69542: 86081 | 86082 | 86083 | 86084 | 86085 | 86086 | 86087 | 86088 | 86089 | 86090

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.