[patch] Don't coredump for sigpipe writing "credentials" byte

dbus-1.3.0-interix-ignore-sigpipe.patch (text/plain), 1.08 KB, created by Greg Turner on 2010-01-14 03:28:00 UTC

--- dbus/dbus-sysdeps-unix.c.orig	2010-01-13 15:01:22 -0800
+++ dbus/dbus-sysdeps-unix.c	2010-01-13 15:00:02 -0800
@@ -1372,6 +1372,10 @@
 {
   int bytes_written;
   char buf[1] = { '\0' };
+#ifdef __INTERIX
+  struct sigaction oldsigaction, newsigaction;
+  int sigactionfailed;
+#endif
 #if defined(HAVE_CMSGCRED) 
   union {
 	  struct cmsghdr hdr;
@@ -1397,12 +1401,26 @@
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
   
  again:
-
+#ifdef __INTERIX
+  /* It would seem that Interix SIGPIPE happens faster than other UNICES */
+  newsigaction.sa_handler = SIG_IGN;
+  newsigaction.sa_mask = 0;
+  newsigaction.sa_flags = 0;
+  sigactionfailed = 0;
+  if (sigaction(SIGPIPE, &newsigaction, &oldsigaction) < 0) {
+  	_dbus_warn("sigaction failed before writing to pipe.\n");
+	sigactionfailed = 1;
+  }
+#endif
 #if defined(HAVE_CMSGCRED) 
   bytes_written = sendmsg (server_fd, &msg, 0);
 #else
   bytes_written = write (server_fd, buf, 1);
 #endif
+#ifdef __INTERIX
+  if (!sigactionfailed)
+    sigaction(SIGPIPE, &oldsigaction, NULL);
+#endif
 
   if (bytes_written < 0 && errno == EINTR)
     goto again;