Skip to content

child_process: spawn() and spawnSync() validation #8312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cjihrig merged 3 commits into from
Dec 25, 2016
Merged

child_process: spawn() and spawnSync() validation #8312

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b374ee8
src: add handle check to spawn_sync
cjihrig Aug 28, 2016
fc7b0dd
child_process: improve input validation
cjihrig Aug 28, 2016
45c9ca7
src: remove redundant spawn/spawnSync type checks
cjihrig Oct 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
src: add handle check to spawn_sync 
This commit verifies that the child process handle is of the
correct type before trying to close it in
CloseHandlesAndDeleteLoop(). This catches the case where input
validation failed, and the child process was never actually
spawned.

Fixes: #8096
Fixes: #8539
Refs: #9722
PR-URL: #8312
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
@cjihrig
cjihrig committed Dec 25, 2016
commit b374ee8c3dfcefe7b22060c1a2073ee07e4e1b8c
7 changes: 6 additions & 1 deletion src/spawn_sync.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,12 @@ void SyncProcessRunner::CloseHandlesAndDeleteLoop() {
// Close the process handle when ExitCallback was not called.
uv_handle_t* uv_process_handle =
reinterpret_cast<uv_handle_t*>(&uv_process_);
if (!uv_is_closing(uv_process_handle))

// Close the process handle if it is still open. The handle type also
// needs to be checked because TryInitializeAndRunLoop() won't spawn a
// process if input validation fails.
if (uv_process_handle->type == UV_PROCESS &&
!uv_is_closing(uv_process_handle))
uv_close(uv_process_handle, nullptr);

// Give closing watchers a chance to finish closing and get their close
Expand Down