1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

child_process: ignore undef/proto values of env

Browse Source 
At present, undefined values of env option will be transferred as
a "undefined" string value, and values in prototype will also be
included, which are not usual behaviors.

This commit prevents those to be transferred to the environment of
the child process.

PR-URL: https://github.com/nodejs/node/pull/15089
Fixes: https://github.com/nodejs/node/issues/15087
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
This commit is contained in:
现充 2017-08-30 17:57:12 +08:00 committed by Michaël Zasso
parent 858b48b692
commit 85739b6c5b
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/api/child_process.md
View File

@ -437,6 +437,8 @@ If not given, the default is to inherit the current working directory.
Use `env` to specify environment variables that will be visible to the new Use `env` to specify environment variables that will be visible to the new
process, the default is [`process.env`][]. process, the default is [`process.env`][].
`undefined` values in `env` will be ignored.
Example of running `ls -lh /usr`, capturing `stdout`, `stderr`, and the Example of running `ls -lh /usr`, capturing `stdout`, `stderr`, and the
exit code: exit code:

7
lib/child_process.js
View File

@ -504,8 +504,11 @@ function normalizeSpawnArguments(file, args, options) {
var env = options.env || process.env; var env = options.env || process.env;
var envPairs = []; var envPairs = [];
for (var key in env) { for (const key of Object.keys(env)) {
envPairs.push(`${key}=${env[key]}`); const value = env[key];
if (value !== undefined) {
envPairs.push(`${key}=${value}`);
}
} }
_convertCustomFds(options); _convertCustomFds(options);

11
test/parallel/test-child-process-env.js
View File

@ -22,11 +22,15 @@
'use strict'; 'use strict';
const common = require('../common'); const common = require('../common');
const assert = require('assert'); const assert = require('assert');
const os = require('os');
const spawn = require('child_process').spawn; const spawn = require('child_process').spawn;
const env = { const env = {
'HELLO': 'WORLD' 'HELLO': 'WORLD',
'UNDEFINED': undefined,
'NULL': null,
'EMPTY': ''
}; };
Object.setPrototypeOf(env, { Object.setPrototypeOf(env, {
'FOO': 'BAR' 'FOO': 'BAR'
@ -53,5 +57,8 @@ child.stdout.on('data', function(chunk) {
process.on('exit', function() { process.on('exit', function() {
assert.ok(response.includes('HELLO=WORLD')); assert.ok(response.includes('HELLO=WORLD'));
assert.ok(response.includes('FOO=BAR')); assert.ok(!response.includes('FOO='));
assert.ok(!response.includes('UNDEFINED=undefined'));
assert.ok(response.includes('NULL=null'));
assert.ok(response.includes(`EMPTY=${os.EOL}`));
}); });