gdm r6710 - in trunk: . gui/simple-greeter

[fcrozat svn gnome org]

Author: fcrozat
Date: Tue Feb 17 14:43:21 2009
New Revision: 6710
URL: http://svn.gnome.org/viewvc/gdm?rev=6710&view=rev

Log:
2009-02-17  Frederic Crozat  <fcrozat mandriva com>

        * gui/simple-greeter/gdm-layouts.c:
        * gui/simple-greeter/test-remote-login-window.c:
        Fix format-security warning. Bug #572047.



Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-layouts.c
   trunk/gui/simple-greeter/test-remote-login-window.c

Modified: trunk/gui/simple-greeter/gdm-layouts.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-layouts.c	(original)
+++ trunk/gui/simple-greeter/gdm-layouts.c	Tue Feb 17 14:43:21 2009
@@ -120,7 +120,7 @@
 
         item = xkl_config_item_new ();
 
-        g_snprintf (item->name, XKL_MAX_CI_NAME_LENGTH, id1);
+        g_snprintf (item->name, XKL_MAX_CI_NAME_LENGTH, "%s", id1);
         if (xkl_config_registry_find_layout (config_registry, item)) {
                 layout = xci_desc_to_utf8 (item);
         } else {
@@ -128,7 +128,7 @@
         }
 
         if (id2 != NULL) {
-                g_snprintf (item->name, XKL_MAX_CI_NAME_LENGTH, id2);
+                g_snprintf (item->name, XKL_MAX_CI_NAME_LENGTH, "%s", id2);
                 if (xkl_config_registry_find_variant (config_registry, id1, item))
                         variant = xci_desc_to_utf8 (item);
                 else

Modified: trunk/gui/simple-greeter/test-remote-login-window.c
==============================================================================
--- trunk/gui/simple-greeter/test-remote-login-window.c	(original)
+++ trunk/gui/simple-greeter/test-remote-login-window.c	Tue Feb 17 14:43:21 2009
@@ -58,7 +58,7 @@
         error = NULL;
         re = g_regex_new ("hostname: (?P<hostname>[a-zA-Z0-9.-]+)", 0, 0, &error);
         if (re == NULL) {
-                g_warning (error->message);
+                g_warning ("%s", error->message);
                 goto out;
         }