OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2026-01-15 12:15:26 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

src: fix execArgv in worker

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/53029
Fixes: https://github.com/nodejs/node/issues/53011
Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
This commit is contained in:
theanarkh
2024-05-23 23:27:50 +08:00
committed by GitHub
parent 124aed22d5
commit c137d6eb31
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/node_worker.cc
View File

@@ -590,9 +590,8 @@ void Worker::New(const FunctionCallbackInfo<Value>& args) {
exec_argv.push_back(arg_string);
}
} else {
exec_argv_out = env->exec_argv();
exec_argv.insert(
exec_argv.end(), exec_argv_out.begin(), exec_argv_out.end());
exec_argv.end(), env->exec_argv().begin(), env->exec_argv().end());
}
std::vector<std::string> invalid_args{};
@@ -608,7 +607,9 @@ void Worker::New(const FunctionCallbackInfo<Value>& args) {
// The first argument is program name.
invalid_args.erase(invalid_args.begin());
if (errors.size() > 0 || invalid_args.size() > 0) {
// Only fail for explicitly provided execArgv, this protects from failures
// when execArgv from parent's execArgv is used (which is the default).
if (errors.size() > 0 || (invalid_args.size() > 0 && args[2]->IsArray())) {
Local<Value> error;
if (!ToV8Value(env->context(), errors.size() > 0 ? errors : invalid_args)
.ToLocal(&error)) {

21
test/parallel/test-worker-cli-options.js
View File

@@ -1,16 +1,31 @@
// Flags: --expose-internals
// Flags: --expose-internals --expose-gc
'use strict';
require('../common');
const { Worker } = require('worker_threads');
const assert = require('assert');
const CODE = `
// If the --expose-internals flag does not pass to worker
// require function will throw an error
require('internal/options');
global.gc();
`;
// Test if the flags is passed to worker threads
// Test if the flags is passed to worker threads correctly
// and do not throw an error with the invalid execArgv
// when execArgv is inherited from parent
// See https://github.com/nodejs/node/issues/52825
// See https://github.com/nodejs/node/issues/53011
// Inherited env, execArgv from the parent will be ok
new Worker(CODE, { eval: true });
new Worker(CODE, { eval: true, env: process.env, execArgv: ['--expose-internals'] });
// Pass process.env explicitly and inherited execArgv from parent will be ok
new Worker(CODE, { eval: true, env: process.env });
// Inherited env from the parent and pass execArgv (Node.js options) explicitly will be ok
new Worker(CODE, { eval: true, execArgv: ['--expose-internals'] });
// Pass process.env and execArgv (Node.js options) explicitly will be ok
new Worker(CODE, { eval: true, env: process.env, execArgv: ['--expose-internals'] });
// Pass execArgv (V8 options) explicitly will throw an error
assert.throws(() => {
new Worker(CODE, { eval: true, execArgv: ['--expose-gc'] });
}, /ERR_WORKER_INVALID_EXEC_ARGV/);