From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 11 Sep 2015 16:14:11 +0000 (+0200)
Subject: execute: invalidate idle pipe after use
X-Git-Tag: v227~138^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54eb2300ae07d28922a18a9d14dc597850535e9c;p=thirdparty%2Fsystemd.git

execute: invalidate idle pipe after use

Not strictly necessary, but makes clear the fds are invalidated. Make
sure we do the same here as in most other cases.
---

diff --git a/src/core/execute.c b/src/core/execute.c
index d1acda6682e..8773d9cdfbc 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1160,8 +1160,8 @@ static void do_idle_pipe_dance(int idle_pipe[4]) {
         assert(idle_pipe);
 
 
-        safe_close(idle_pipe[1]);
-        safe_close(idle_pipe[2]);
+        idle_pipe[1] = safe_close(idle_pipe[1]);
+        idle_pipe[2] = safe_close(idle_pipe[2]);
 
         if (idle_pipe[0] >= 0) {
                 int r;
@@ -1176,11 +1176,11 @@ static void do_idle_pipe_dance(int idle_pipe[4]) {
                                 fd_wait_for_event(idle_pipe[0], POLLHUP, IDLE_TIMEOUT2_USEC);
                 }
 
-                safe_close(idle_pipe[0]);
+                idle_pipe[0] = safe_close(idle_pipe[0]);
 
         }
 
-        safe_close(idle_pipe[3]);
+        idle_pipe[3] = safe_close(idle_pipe[3]);
 }
 
 static int build_environment(