fix resource leak of self-pipe

sekiguchi-nagisa · Apr 17, 2024 · 044d3c6 · 044d3c6
1 parent 4a34368
commit 044d3c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@
 
 - bugfix code generation of catch block with nested blocks (fix potential resource leak)
 - correctly set ``PIPESTATUS`` when throw error from last-pipe
+- fix resource leak of file descriptor (self-pipe) when fork failed
 
 ## [0.33.2] - 2024-04-11
 

diff --git a/src/vm.cpp b/src/vm.cpp
@@ -774,7 +774,7 @@ static Value toCmdDesc(const ArrayObject &argvObj) {
 bool VM::forkAndExec(ARState &state, const char *filePath, const ArrayObject &argvObj,
                      Value &&redirConfig) {
   // setup self pipe
-  int selfPipe[2];
+  pipe_t selfPipe;
   if (pipe(selfPipe) < 0) {
     fatal_perror("pipe creation error");
   }
@@ -786,6 +786,7 @@ bool VM::forkAndExec(ARState &state, const char *filePath, const ArrayObject &ar
   const auto procOp = resolveProcOp(state, ForkKind::NONE);
   auto proc = Proc::fork(state, pgid, procOp);
   if (proc.pid() == -1) {
+    closeAllPipe(selfPipe);
     raiseCmdError(state, argvObj.getValues()[0].asCStr(), EAGAIN);
     return false;
   } else if (proc.pid() == 0) { // child