the API contract says sitter_p can be NULL, so let's check it (FDO Bug #12919)

2008-01-15  John (J5) Palmieri  <johnp@redhat.com>

	* patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>

	* dbus/dbus-spawn.c (_dbus_spawn_async_with_babysitter): the API
	contract says sitter_p can be NULL, so let's check it (FDO Bug #12919)

diff --git a/ChangeLog b/ChangeLog
index d0020c7933c81cb2a458a2f212468f3c507092d7..dfa00b17869f76abbbb597e018c97a038c6aeb9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-15  John (J5) Palmieri  <johnp@redhat.com>
+       
+       * patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>
+
+       * dbus/dbus-spawn.c (_dbus_spawn_async_with_babysitter): the API 
+       contract says sitter_p can be NULL, so let's check it (FDO Bug #12919)
+
 2008-01-15  John (J5) Palmieri  <johnp@redhat.com>
        
        * patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>

diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c
index 52d3eef00912b0d4aa99a8d7cff59ff32c69bec7..ba6e6ddfd0602ef8b93bc39874621efff8f0ac2e 100644 (file)
--- a/dbus/dbus-spawn.c
+++ b/dbus/dbus-spawn.c
@@ -1085,7 +1085,9 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter          **sitter_p,
   
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
 
-  *sitter_p = NULL;
+  if (sitter_p != NULL)
+    *sitter_p = NULL;
+
   sitter = NULL;
 
   sitter = _dbus_babysitter_new ();