]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
execute: some extra asserts
authorLennart Poettering <lennart@poettering.net>
Fri, 27 Oct 2017 12:59:05 +0000 (14:59 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 17 Nov 2017 10:13:44 +0000 (11:13 +0100)
In some cases we checked for fd validity already explicitly, let's do
this for all our fds.

src/core/execute.c

index 6f93f04715b8b9e08aede5aeb1ba3b42468712f8..7018322958a50b774bf0f3cd08daa1062b56874a 100644 (file)
@@ -469,9 +469,13 @@ static int setup_input(
         }
 
         case EXEC_INPUT_SOCKET:
+                assert(socket_fd >= 0);
+
                 return dup2(socket_fd, STDIN_FILENO) < 0 ? -errno : STDIN_FILENO;
 
         case EXEC_INPUT_NAMED_FD:
+                assert(named_iofds[STDIN_FILENO] >= 0);
+
                 (void) fd_nonblock(named_iofds[STDIN_FILENO], false);
                 return dup2(named_iofds[STDIN_FILENO], STDIN_FILENO) < 0 ? -errno : STDIN_FILENO;
 
@@ -612,9 +616,12 @@ static int setup_output(
 
         case EXEC_OUTPUT_SOCKET:
                 assert(socket_fd >= 0);
+
                 return dup2(socket_fd, fileno) < 0 ? -errno : fileno;
 
         case EXEC_OUTPUT_NAMED_FD:
+                assert(named_iofds[fileno] >= 0);
+
                 (void) fd_nonblock(named_iofds[fileno], false);
                 return dup2(named_iofds[fileno], fileno) < 0 ? -errno : fileno;