Skip to content

Commit 2b0f65e

Browse files
aduh95RafaelGSS
authored andcommitted
src: improve error handling in node_env_var.cc
PR-URL: #57767 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
1 parent 3edea66 commit 2b0f65e

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/node_env_var.cc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -436,15 +436,14 @@ static Intercepted EnvGetter(Local<Name> property,
436436
MaybeLocal<String> value_string =
437437
env->env_vars()->Get(env->isolate(), property.As<String>());
438438

439-
bool has_env = !value_string.IsEmpty();
440439
TraceEnvVar(env, "get", property.As<String>());
441440

442-
if (has_env) {
443-
// ToLocalChecked here is ok since we check IsEmpty above.
444-
info.GetReturnValue().Set(value_string.ToLocalChecked());
445-
return Intercepted::kYes;
441+
Local<Value> ret;
442+
if (!value_string.ToLocal(&ret)) {
443+
return Intercepted::kNo;
446444
}
447-
return Intercepted::kNo;
445+
info.GetReturnValue().Set(ret);
446+
return Intercepted::kYes;
448447
}
449448

450449
static Intercepted EnvSetter(Local<Name> property,

0 commit comments

Comments
 (0)