Skip to content

Commit

Permalink
node: do not crash on IPC stdin
Browse files Browse the repository at this point in the history
When started with IPC pipe on fd=0 child process should not crash when
referencing or using `process.stdin`.

fix nodejs/node-v0.x-archive#8669

PR-URL: node-forward/node#45
Reviewed-By: Ben Noorhduis <[email protected]>
  • Loading branch information
indutny committed Nov 4, 2014
1 parent b1dcaad commit ef46ca6
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 5 deletions.
23 changes: 18 additions & 5 deletions src/node.js
Original file line number Diff line number Diff line change
Expand Up @@ -582,11 +582,24 @@
case 'PIPE':
case 'TCP':
var net = NativeModule.require('net');
stdin = new net.Socket({
fd: fd,
readable: true,
writable: false
});

// It could be that process has been started with an IPC channel
// sitting on fd=0, in such case the pipe for this fd is already
// present and creating a new one will lead to the assertion failure
// in libuv.
if (process._channel && process._channel.fd === fd) {
stdin = new net.Socket({
handle: process._channel,
readable: true,
writable: false
});
} else {
stdin = new net.Socket({
fd: fd,
readable: true,
writable: false
});
}
break;

default:
Expand Down
44 changes: 44 additions & 0 deletions test/simple/test-child-process-stdin-ipc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to permit
// persons to whom the Software is furnished to do so, subject to the
// following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.

var common = require('../common');
var assert = require('assert');

var spawn = require('child_process').spawn;

if (process.argv[2] === 'child') {
// Just reference stdin, it should start it
process.stdin;
return;
}

var proc = spawn(process.execPath, [__filename, 'child'], {
stdio: ['ipc', 'inherit', 'inherit']
});

var childCode = -1;
proc.on('exit', function(code) {
childCode = code;
});

process.on('exit', function() {
assert.equal(childCode, 0);
});

0 comments on commit ef46ca6

Please sign in to comment.