r38366 - in /desktop/wheezy/gnome-settings-daemon/debian: changelog patches/10_smaller_syndaemon_timeout.patch

[pochu at users.alioth.debian.org]

Author: pochu
Date: Tue Jun  4 22:14:51 2013
New Revision: 38366

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38366
Log:
* debian/patches/10_smaller_syndaemon_timeout.patch:
  + Update patch to not write out of the array bounds. Fixes a crash
    when the "Disable touchpad while typing" option is activated.
    Closes: #684998.

Modified:
    desktop/wheezy/gnome-settings-daemon/debian/changelog
    desktop/wheezy/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch

Modified: desktop/wheezy/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/wheezy/gnome-settings-daemon/debian/changelog?rev=38366&op=diff
==============================================================================
--- desktop/wheezy/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/wheezy/gnome-settings-daemon/debian/changelog [utf-8] Tue Jun  4 22:14:51 2013
@@ -1,7 +1,14 @@
 gnome-settings-daemon (3.4.2+git20121218.7c1322-3+deb7u1) UNRELEASED; urgency=low
 
+  [ Xiyue Deng ]
   * Backport from sid:
     - Disable "-Wl,-z,defs" on mipsel to fix segfault.  (Closes: #629351)
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/patches/10_smaller_syndaemon_timeout.patch:
+    + Update patch to not write out of the array bounds. Fixes a crash
+      when the "Disable touchpad while typing" option is activated.
+      Closes: #684998.
 
  -- Xiyue Deng <manphiz-guest at users.alioth.debian.org>  Mon, 03 Jun 2013 00:53:30 -0700
 

Modified: desktop/wheezy/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/wheezy/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch?rev=38366&op=diff
==============================================================================
--- desktop/wheezy/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch [utf-8] (original)
+++ desktop/wheezy/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch [utf-8] Tue Jun  4 22:14:51 2013
@@ -1,8 +1,15 @@
-Index: gnome-settings-daemon-3.4.2+git20120925.a4c817/plugins/mouse/gsd-mouse-manager.c
-===================================================================
---- gnome-settings-daemon-3.4.2+git20120925.a4c817.orig/plugins/mouse/gsd-mouse-manager.c	2012-09-29 12:09:15.000000000 +0200
-+++ gnome-settings-daemon-3.4.2+git20120925.a4c817/plugins/mouse/gsd-mouse-manager.c	2012-09-29 12:11:23.119038602 +0200
-@@ -577,7 +577,8 @@ set_disable_w_typing (GsdMouseManager *m
+--- a/plugins/mouse/gsd-mouse-manager.c
++++ b/plugins/mouse/gsd-mouse-manager.c
+@@ -567,7 +567,7 @@
+ {
+         if (state && touchpad_is_present ()) {
+                 GError *error = NULL;
+-                char *args[6];
++                char *args[7];
+ 
+                 if (manager->priv->syndaemon_spawned)
+                         return 0;
+@@ -577,7 +577,8 @@
                  args[2] = "1.0";
                  args[3] = "-K";
                  args[4] = "-R";