Attachment 85236 Details for Bug 68945 – _dbus_babysitter_unref: avoid infinite loop if waitpid() returns EINTR

[patch] _dbus_babysitter_unref: avoid infinite loop if waitpid() returns EINTR

0001-_dbus_babysitter_unref-avoid-infinite-loop-if-waitpi.patch (text/plain), 1.59 KB, created by Simon McVittie on 2013-09-05 10:31:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-09-05 10:31:17 UTC

Size: 1.59 KB

patch

obsolete

>From a4f11f83a4b8ba8c7feecd37c7606d0d792d7fe6 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 4 Sep 2013 17:53:23 +0100
>Subject: [PATCH] _dbus_babysitter_unref: avoid infinite loop if waitpid()
> returns EINTR
>
>If waitpid() failed with EINTR, we'd go back for another go, but
>because ret is nonzero, we'd skip the waitpid() and just keep looping.
>
>Also avoid an unnecessary "goto" in favour of a proper loop, to make it
>more clearly correct.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68945
>---
> dbus/dbus-spawn.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
>diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c
>index ef00801..6e42f55 100644
>--- a/dbus/dbus-spawn.c
>+++ b/dbus/dbus-spawn.c
>@@ -308,15 +308,18 @@ _dbus_babysitter_unref (DBusBabysitter *sitter)
>           if (ret == 0)
>             kill (sitter->sitter_pid, SIGKILL);
> 
>-        again:
>           if (ret == 0)
>-            ret = waitpid (sitter->sitter_pid, &status, 0);
>+            {
>+              do
>+                {
>+                  ret = waitpid (sitter->sitter_pid, &status, 0);
>+                }
>+              while (_DBUS_UNLIKELY (ret < 0 && errno == EINTR));
>+            }
> 
>           if (ret < 0)
>             {
>-              if (errno == EINTR)
>-                goto again;
>-              else if (errno == ECHILD)
>+              if (errno == ECHILD)
>                 _dbus_warn ("Babysitter process not available to be reaped; should not happen\n");
>               else
>                 _dbus_warn ("Unexpected error %d in waitpid() for babysitter: %s\n",
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 68945: 85236

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.