Attachment 88461 Details for Bug 60859 – [PATCH 2/2] capture.c: ignore SIGPIPE if message capture enabled

[patch] [PATCH 2/2] capture.c: ignore SIGPIPE if message capture enabled

0002-capture.c-ignore-SIGPIPE-if-message-capture-enabled.patch (text/plain), 1.12 KB, created by Chengwei Yang on 2013-11-01 08:37:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chengwei Yang

Created: 2013-11-01 08:37:59 UTC

Size: 1.12 KB

patch

obsolete

>From 63f7c1b3d137f60752c87e6b2dfc07436b3027f6 Mon Sep 17 00:00:00 2001
>From: Chengwei Yang <chengwei.yang@intel.com>
>Date: Fri, 1 Nov 2013 16:33:57 +0800
>Subject: [PATCH 2/2] capture.c: ignore SIGPIPE if message capture enabled
>
>Since we use popen(3) to pipe the captured package to <cap_recipient>
>stdin, it's necessary to ignore SIGPIPE to prevent us from crash if the
>pipe broken by any reason.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=60859
>---
> bus/capture.c |    5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/bus/capture.c b/bus/capture.c
>index f15a7c3..4dc84fb 100644
>--- a/bus/capture.c
>+++ b/bus/capture.c
>@@ -22,7 +22,9 @@
>  */
> 
> #include <config.h>
>+#include <signal.h>
> #include "capture.h"
>+#include "dbus/dbus-sysdeps.h"
> 
> #ifdef DBUS_ENABLE_CAPTURE
> 
>@@ -71,6 +73,9 @@ bus_capture_maybe_start (BusCapture      *self,
>   if (command == NULL || *command == '\0')
>     return;
> 
>+  /* ignore SIGPIPE so we don't crash if the capture pipe broken */
>+  _dbus_set_signal_handler (SIGPIPE, SIG_IGN);
>+
>   /* For simplicity, we use stdio to perform blocking I/O. */
>   self->pcap = popen (command, "w");
> 
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 60859: 74834 | 74835 | 74836 | 74837 | 74838 | 74839 | 74840 | 88459 | 88460 | 88461

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.