summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2008-01-15 15:45:20 -0500
committerJohn (J5) Palmieri <johnp@redhat.com>2008-01-15 15:45:20 -0500
commit7ba3dc8bf980857e03e0f19713adb918dcab4d15 (patch)
treecf2e3997e5c832f80f04422805eb78041067ae17
parentc8a9cf81039d2f3ddd8651880028cf9ac8ec7f05 (diff)
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)
-rw-r--r--ChangeLog7
-rw-r--r--dbus/dbus-spawn.c4
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d0020c79..dfa00b17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
* 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>
+
* dbus/dbus-spawn.c (read_ints, read_pid): use correct ssize_t type
instead of size_t (FDO Bug #12862)
diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c
index 52d3eef0..ba6e6ddf 100644
--- 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 ();