diff options
| -rw-r--r-- | src/node.cc | 10 | ||||
| -rw-r--r-- | src/node_process_object.cc | 12 |
2 files changed, 10 insertions, 12 deletions
diff --git a/src/node.cc b/src/node.cc index 89217e47bc..94947cb34a 100644 --- a/src/node.cc +++ b/src/node.cc @@ -340,6 +340,16 @@ MaybeLocal<Value> RunBootstrapping(Environment* env) { MaybeLocal<Value> result = ExecuteBootstrapper( env, "internal/bootstrap/node", &node_params, &node_args); + Local<Object> env_var_proxy; + if (!CreateEnvVarProxy(context, isolate, env->as_callback_data()) + .ToLocal(&env_var_proxy) || + process + ->Set(env->context(), + FIXED_ONE_BYTE_STRING(env->isolate(), "env"), + env_var_proxy) + .IsNothing()) + return MaybeLocal<Value>(); + env->set_has_run_bootstrapping_code(true); return scope.EscapeMaybe(result); diff --git a/src/node_process_object.cc b/src/node_process_object.cc index 3e0bac6d23..c8a2c26690 100644 --- a/src/node_process_object.cc +++ b/src/node_process_object.cc @@ -151,18 +151,6 @@ MaybeLocal<Object> CreateProcessObject( ToV8Value(env->context(), exec_args) .ToLocalChecked()).FromJust(); - Local<Object> env_var_proxy; - if (!CreateEnvVarProxy(context, isolate, env->as_callback_data()) - .ToLocal(&env_var_proxy)) - return MaybeLocal<Object>(); - - // process.env - process - ->Set(env->context(), - FIXED_ONE_BYTE_STRING(env->isolate(), "env"), - env_var_proxy) - .FromJust(); - READONLY_PROPERTY(process, "pid", Integer::New(env->isolate(), uv_os_getpid())); |