Skip to content

Commit 832ec1c

Browse files
sam-githubindutny
authored andcommitted
process: throw TypeError if kill pid not a number
Currently, invalid usage such as: process.kill('SIGTERM') process.kill(null) process.kill(undefined); all coerce the pid to 0, and signal the current process. Signed-off-by: Fedor Indutny <fedor@indutny.com>
1 parent 9a63a1d commit 832ec1c

2 files changed

Lines changed: 68 additions & 0 deletions

File tree

src/node.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,10 @@
602602
process.kill = function(pid, sig) {
603603
var err;
604604

605+
if (typeof pid !== 'number' || !isFinite(pid)) {
606+
throw new TypeError('pid must be a number');
607+
}
608+
605609
// preserve null signal
606610
if (0 === sig) {
607611
err = process._kill(pid, 0);
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
// Copyright Joyent, Inc. and other Node contributors.
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a
4+
// copy of this software and associated documentation files (the
5+
// "Software"), to deal in the Software without restriction, including
6+
// without limitation the rights to use, copy, modify, merge, publish,
7+
// distribute, sublicense, and/or sell copies of the Software, and to permit
8+
// persons to whom the Software is furnished to do so, subject to the
9+
// following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
17+
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20+
// USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
23+
var common = require('../common');
24+
var assert = require('assert');
25+
26+
var pass;
27+
var wait = setInterval(function(){}, 1000);
28+
29+
process.on('exit', function(code) {
30+
if (code === 0) {
31+
assert.ok(pass);
32+
}
33+
});
34+
35+
// test variants of pid
36+
//
37+
// null: TypeError
38+
// undefined: TypeError
39+
//
40+
// 'SIGTERM': TypeError
41+
//
42+
// String(process.pid): TypeError
43+
//
44+
// Nan, Infinity, -Infinity: TypeError
45+
//
46+
// 0, process.pid: ourself
47+
48+
assert.throws(function() { process.kill('SIGTERM'); }, TypeError);
49+
assert.throws(function() { process.kill(String(process.pid)); }, TypeError);
50+
assert.throws(function() { process.kill(null); }, TypeError);
51+
assert.throws(function() { process.kill(undefined); }, TypeError);
52+
assert.throws(function() { process.kill(+'not a number'); }, TypeError);
53+
assert.throws(function() { process.kill(1/0); }, TypeError);
54+
assert.throws(function() { process.kill(-1/0); }, TypeError);
55+
56+
process.once('SIGHUP', function() {
57+
process.once('SIGHUP', function() {
58+
pass = true;
59+
clearInterval(wait);
60+
});
61+
process.kill(process.pid, 'SIGHUP');
62+
});
63+
64+
process.kill(0, 'SIGHUP');

0 commit comments

Comments
 (0)