Cancel child PID watcher on destroy and close sockets before proc_close

amphp · Sep 19, 2017 · be733cc · be733cc
1 parent 6c5eba0
commit be733cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/Internal/Windows/Runner.php b/lib/Internal/Windows/Runner.php
@@ -152,6 +152,11 @@ public function destroy(ProcessHandle $handle) {
             }
         }
 
+        if ($handle->childPidWatcher !== null) {
+            Loop::cancel($handle->childPidWatcher);
+            $handle->childPidWatcher = null;
+        }
+
         if ($handle->exitCodeWatcher !== null) {
             Loop::cancel($handle->exitCodeWatcher);
             $handle->exitCodeWatcher = null;

diff --git a/lib/Internal/Windows/SocketConnector.php b/lib/Internal/Windows/SocketConnector.php
@@ -311,8 +311,6 @@ public function onProcessConnectTimeout($watcher, Handle $handle) {
         }
         $error = $error ?: 'Process did not connect to server before timeout elapsed';
 
-        \fclose($handle->wrapperStderrPipe);
-        \proc_close($handle->proc);
         foreach ($handle->sockets as $socket) {
             \fclose($socket);
         }
@@ -322,6 +320,9 @@ public function onProcessConnectTimeout($watcher, Handle $handle) {
             $deferred->fail($error);
         }
 
+        \fclose($handle->wrapperStderrPipe);
+        \proc_close($handle->proc);
+
         $handle->joinDeferred->fail($error);
     }