From 6cfcabbc006c1a7d5dc506ea317e2f39354e0459 Mon Sep 17 00:00:00 2001
From: "John (J5) Palmieri" <johnp@redhat.com>
Date: Tue, 15 Jan 2008 16:51:30 -0500
Subject: check write return value so we don't hang (FDO Bug #11665)

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

	* patch by Peter O'Gorman <pogma at thewrittenword dot com>

	* dbus/dbus-spawn.c (babysit_signal_handler): check write return value
	so we don't hang (FDO Bug #11665)
---
 ChangeLog         | 7 +++++++
 dbus/dbus-spawn.c | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 22a5f0c1..68b656da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-15  John (J5) Palmieri  <johnp@redhat.com>
+
+	* patch by Peter O'Gorman <pogma at thewrittenword dot com>
+
+	* dbus/dbus-spawn.c (babysit_signal_handler): check write return value
+	so we don't hang (FDO Bug #11665)
+
 2008-01-15  John (J5) Palmieri  <johnp@redhat.com>
 
 	* patch by Peter O'Gorman <pogma at thewrittenword dot com>
diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c
index ba6e6ddf..d74b3265 100644
--- a/dbus/dbus-spawn.c
+++ b/dbus/dbus-spawn.c
@@ -982,9 +982,9 @@ babysit_signal_handler (int signo)
 {
   char b = '\0';
  again:
-  write (babysit_sigchld_pipe, &b, 1);
-  if (errno == EINTR)
-    goto again;
+  if (write (babysit_sigchld_pipe, &b, 1) <= 0) 
+    if (errno == EINTR)
+      goto again;
 }
 
 static void
-- 
cgit