From 7ba3dc8bf980857e03e0f19713adb918dcab4d15 Mon Sep 17 00:00:00 2001
From: "John (J5) Palmieri" <johnp@redhat.com>
Date: Tue, 15 Jan 2008 15:45:20 -0500
Subject: the API contract says sitter_p can be NULL, so let's check it (FDO
 Bug #12919)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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)
---
 dbus/dbus-spawn.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'dbus')

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 ();
-- 
cgit