[Pkg-xfce-commits] r7386 - in desktop/trunk/xfce4-session/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2013-05-17 20:43:51 +0000 (Fri, 17 May 2013)
New Revision: 7386

Added:
   desktop/trunk/xfce4-session/debian/patches/07-Store-the-watch-function-id-to-avoid-possible-double.patch
Modified:
   desktop/trunk/xfce4-session/debian/changelog
   desktop/trunk/xfce4-session/debian/patches/series
Log:
* debian/patches:
  - 07-Store-the-watch-function-id-to-avoid-possible-double added, fix
    double free() with new glib.                              closes: #706425

Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog	2013-05-11 22:25:05 UTC (rev 7385)
+++ desktop/trunk/xfce4-session/debian/changelog	2013-05-17 20:43:51 UTC (rev 7386)
@@ -1,3 +1,11 @@
+xfce4-session (4.8.3-4) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 07-Store-the-watch-function-id-to-avoid-possible-double added, fix
+      double free() with new glib.                              closes: #706425
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 17 May 2013 22:36:22 +0200
+
 xfce4-session (4.8.3-3) unstable; urgency=low
 
   * debian/patches:

Added: desktop/trunk/xfce4-session/debian/patches/07-Store-the-watch-function-id-to-avoid-possible-double.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/07-Store-the-watch-function-id-to-avoid-possible-double.patch	                        (rev 0)
+++ desktop/trunk/xfce4-session/debian/patches/07-Store-the-watch-function-id-to-avoid-possible-double.patch	2013-05-17 20:43:51 UTC (rev 7386)
@@ -0,0 +1,26 @@
+From ab391138cacc62ab184a338e237c4430356b41f9 Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick at xfce.org>
+Date: Fri, 26 Apr 2013 20:05:10 +0200
+Subject: [PATCH] Store the watch function id to avoid possible double free
+ (bug #9709).
+
+---
+ xfce4-session/xfsm-startup.c |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+--- a/xfce4-session/xfsm-startup.c
++++ b/xfce4-session/xfsm-startup.c
+@@ -567,9 +567,10 @@ xfsm_startup_start_properties (XfsmPrope
+   child_watch_data = g_new (XfsmStartupData, 1);
+   child_watch_data->manager = g_object_ref (manager);
+   child_watch_data->properties = properties;
+-  g_child_watch_add_full (G_PRIORITY_LOW, properties->pid,
+-                          xfsm_startup_child_watch, child_watch_data,
+-                          (GDestroyNotify) xfsm_startup_data_free);
++  child_watch_data->properties->child_watch_id =
++      g_child_watch_add_full (G_PRIORITY_LOW, properties->pid,
++                              xfsm_startup_child_watch, child_watch_data,
++                              (GDestroyNotify) xfsm_startup_data_free);
+ 
+   /* set a timeout -- client must register in a a certain amount of time
+    * or it's assumed to be broken/have issues. */

Modified: desktop/trunk/xfce4-session/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/series	2013-05-11 22:25:05 UTC (rev 7385)
+++ desktop/trunk/xfce4-session/debian/patches/series	2013-05-17 20:43:51 UTC (rev 7386)
@@ -3,3 +3,4 @@
 04_fix-missing-lm.patch
 05_force-xfsettingsd-start.patch
 06-Handle-multiple-interactive-session-save-bug-5379.patch
+07-Store-the-watch-function-id-to-avoid-possible-double.patch