[maemo-commits] [maemo-commits] r14609 - in projects/haf/trunk/dbus/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-25 13:24:17 +0300 (Thu, 25 Oct 2007)
New Revision: 14609

Added:
   projects/haf/trunk/dbus/debian/patches/23-add-NULL-check.patch
Modified:
   projects/haf/trunk/dbus/debian/changelog
Log:
added missing NULL check


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2007-10-25 08:24:47 UTC (rev 14608)
+++ projects/haf/trunk/dbus/debian/changelog	2007-10-25 10:24:17 UTC (rev 14609)
@@ -7,6 +7,7 @@
   Bugs discovered by statical code analysis:
   * Added a missing va_end call to dbus_set_error.
   * Use ssize_t instead of size_t to store read(2) return value.
+  * Added a missing NULL check to _dbus_spawn_async_with_babysitter.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 18 Oct 2007 11:21:11 +0300
 

Added: projects/haf/trunk/dbus/debian/patches/23-add-NULL-check.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/23-add-NULL-check.patch	2007-10-25 08:24:47 UTC (rev 14608)
+++ projects/haf/trunk/dbus/debian/patches/23-add-NULL-check.patch	2007-10-25 10:24:17 UTC (rev 14609)
@@ -0,0 +1,14 @@
+diff -pur dbus-1.0.2/dbus/dbus-spawn.c dbus-1.0.2.new/dbus/dbus-spawn.c
+--- dbus-1.0.2/dbus/dbus-spawn.c	2006-12-11 21:21:09.000000000 +0200
++++ dbus-1.0.2.new/dbus/dbus-spawn.c	2007-10-25 13:20:17.192553416 +0300
+@@ -1040,7 +1040,9 @@ _dbus_spawn_async_with_babysitter (DBusB
+   
+   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+ 
+-  *sitter_p = NULL;
++  if (sitter_p != NULL)
++    *sitter_p = NULL;
++
+   sitter = NULL;
+ 
+   sitter = _dbus_babysitter_new ();