imsettings-format-security.patch

   1 --- imsettings-1.4.0/imsettings/imsettings-utils.c~     2012-07-12 10:22:21.000000000 +0200
   2 +++ imsettings-1.4.0/imsettings/imsettings-utils.c      2012-11-12 21:51:48.147954848 +0100
   3 @@ -146,7 +146,7 @@
   4                 GDBusNodeInfo *introspection_data = g_dbus_node_info_new_for_xml(introspection_xml, &err);
   5
   6                 if (err) {
   7 -                       g_warning(err->message);
   8 +                       g_warning("%s", err->message);
   9                         return NULL;
  10                 }
  11                 info = g_dbus_interface_info_ref(introspection_data->interfaces[0]);
  12 --- imsettings-1.4.0/imsettings-daemon/imsettings-module.c~     2011-10-14 05:23:26.000000000 +0200
  13 +++ imsettings-1.4.0/imsettings-daemon/imsettings-module.c      2012-11-12 21:52:35.441286514 +0100
  14 @@ -260,7 +260,7 @@
  15                                                 &mod_cb);
  16
  17                                 if (!mod_cb) {
  18 -                                       g_warning(g_module_error());
  19 +                                       g_warning("%s", g_module_error());
  20                                         goto next;
  21                                 }
  22                                 priv->switch_im = mod_cb;
  23 @@ -268,7 +268,7 @@
  24                                                 "module_dump_im",
  25                                                 &mod_cb);
  26                                 if (!mod_cb) {
  27 -                                       g_warning(g_module_error());
  28 +                                       g_warning("%s", g_module_error());
  29                                         goto next;
  30                                 }
  31                                 priv->dump_im = mod_cb;
  32 --- imsettings-1.4.0/imsettings-daemon/imsettings-proc.c~       2012-04-26 04:15:38.000000000 +0200
  33 +++ imsettings-1.4.0/imsettings-daemon/imsettings-proc.c        2012-11-12 21:53:11.314618581 +0100
  34 @@ -109,7 +109,7 @@
  35         }
  36         str = g_string_new(NULL);
  37         g_string_append_printf(str, "%s[%lu]: %s", module, (gulong)priv->main.pid, buffer);
  38 -       g_message(str->str);
  39 +       g_message("%s", str->str);
  40         g_string_free(str, TRUE);
  41         g_free(buffer);
  42
  43 @@ -204,7 +204,7 @@
  44                                                          type_names[type],
  45                                                          module);
  46
  47 -                       g_critical(message);
  48 +                       g_critical("%s", message);
  49                         g_signal_emit(proc, signals[SIG_NOTIFY_NOTIFICATION], 0, NOTIFY_URGENCY_CRITICAL, title, message, 0);
  50                         g_free(message);
  51                         unref = TRUE;
  52 @@ -303,7 +303,7 @@
  53                 g_set_error(error, IMSETTINGS_GERROR, IMSETTINGS_GERROR_UNKNOWN,
  54                             _("[BUG] %s process is still running [pid: %d]\n"),
  55                             type_name, pinfo->pid);
  56 -               g_warning((*error)->message);
  57 +               g_warning("%s", (*error)->message);
  58                 return FALSE;
  59         } else {
  60                 /* close io channels prior to create new one */
  61 --- imsettings-1.4.0/imsettings-daemon/imsettings-server.c~     2012-08-28 12:50:19.000000000 +0200
  62 +++ imsettings-1.4.0/imsettings-daemon/imsettings-server.c      2012-11-12 21:53:57.621283613 +0100
  63 @@ -119,7 +119,7 @@
  64         notify_notification_show(priv->notify, &err);
  65
  66         if (err) {
  67 -               g_warning(err->message);
  68 +               g_warning("%s", err->message);
  69                 g_error_free(err);
  70         }
  71  }
  72 @@ -707,7 +707,7 @@
  73                 g_clear_error(error);
  74                 g_set_error(error, IMSETTINGS_GERROR, IMSETTINGS_GERROR_IM_NOT_FOUND,
  75                             _("No such input method on your system: %s"), module);
  76 -               g_warning((*error)->message);
  77 +               g_warning("%s", (*error)->message);
  78
  79                 return FALSE;
  80         }
  81 @@ -716,7 +716,7 @@
  82         if (!*info) {
  83                 g_set_error(error, IMSETTINGS_GERROR, IMSETTINGS_GERROR_OOM,
  84                             _("Out of memory"));
  85 -               g_warning((*error)->message);
  86 +               g_warning("%s", (*error)->message);
  87
  88                 return FALSE;
  89         }
  90 @@ -750,7 +750,7 @@
  91                         } else if (match) {
  92                                 g_set_error(error, IMSETTINGS_GERROR, IMSETTINGS_GERROR_NOT_TARGETED_DESKTOP,
  93                                                     _("Current desktop isn't targeted by Input Method."));
  94 -                               g_warning((*error)->message);
  95 +                               g_warning("%s", (*error)->message);
  96                                 g_strfreev(list);
  97
  98                                 return FALSE;
  99 --- imsettings-1.4.0/backends/lxde/lxde-module.c~       2012-04-23 10:28:00.000000000 +0200
 100 +++ imsettings-1.4.0/backends/lxde/lxde-module.c        2012-11-12 21:54:41.767948722 +0100
 101 @@ -176,7 +176,7 @@
 102
 103         retval = g_key_file_get_string(key, "GTK", "sGtk/IMModule", &err);
 104         if (err) {
 105 -               g_warning(err->message);
 106 +               g_warning("%s", err->message);
 107                 g_error_free(err);
 108         }
 109    finalize:
 110 --- imsettings-1.4.0/backends/xim/loopback.c~   2011-03-08 07:39:32.000000000 +0100
 111 +++ imsettings-1.4.0/backends/xim/loopback.c    2012-11-12 21:56:22.811278492 +0100
 112 @@ -774,7 +774,7 @@
 113                 gboolean retval;
 114
 115                 g_xim_message_warning(G_XIM_PROTOCOL_GET_IFACE (proto)->message,
 116 -                                     msg);
 117 +                                     "%s", msg);
 118                 retval = g_xim_connection_cmd_error(G_XIM_CONNECTION (proto),
 119                                                     imid, icid, G_XIM_EMASK_VALID_IMID | G_XIM_EMASK_VALID_ICID,
 120                                                     G_XIM_ERR_BadProtocol,
 121 @@ -804,7 +804,7 @@
 122                 gboolean retval;
 123
 124                 g_xim_message_warning(G_XIM_PROTOCOL_GET_IFACE (proto)->message,
 125 -                                     msg);
 126 +                                     "%s", msg);
 127                 retval = g_xim_connection_cmd_error(G_XIM_CONNECTION (proto),
 128                                                     imid, icid, G_XIM_EMASK_VALID_IMID | G_XIM_EMASK_VALID_ICID,
 129                                                     G_XIM_ERR_BadProtocol,
 130 @@ -845,7 +845,7 @@
 131                 gboolean retval;
 132
 133                 g_xim_message_warning(G_XIM_PROTOCOL_GET_IFACE (proto)->message,
 134 -                                     msg);
 135 +                                     "%s", msg);
 136                 retval = g_xim_connection_cmd_error(G_XIM_CONNECTION (proto),
 137                                                     imid, icid, G_XIM_EMASK_VALID_IMID | G_XIM_EMASK_VALID_ICID,
 138                                                     G_XIM_ERR_BadProtocol,
 139 --- imsettings-1.4.0/backends/xim/proxy.c~      2011-03-08 07:39:32.000000000 +0100
 140 +++ imsettings-1.4.0/backends/xim/proxy.c       2012-11-12 21:56:58.437943903 +0100
 141 @@ -796,7 +796,7 @@
 142                 retval = g_xim_connection_cmd_error(G_XIM_CONNECTION (conn), imid, icid, flag,
 143                                                     G_XIM_ERR_BadProtocol, 0, msg);
 144         }
 145 -       g_xim_message_error(G_XIM_PROTOCOL_GET_IFACE (proto)->message, msg);
 146 +       g_xim_message_error(G_XIM_PROTOCOL_GET_IFACE (proto)->message, "%s", msg);
 147         g_free(msg);
 148
 149         return retval;