Skip to content

Commit 6625380

Browse files
committed
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 7246c69 commit 6625380

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/node_env_var.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -417,14 +417,14 @@ static Intercepted EnvGetter(Local<Name> property,
417417
MaybeLocal<String> value_string =
418418
env->env_vars()->Get(env->isolate(), property.As<String>());
419419

420-
bool has_env = !value_string.IsEmpty();
421420
TraceEnvVar(env, "get", property.As<String>());
422421

423-
if (has_env) {
424-
info.GetReturnValue().Set(value_string.ToLocalChecked());
425-
return Intercepted::kYes;
422+
Local<Value> ret;
423+
if (!value_string.ToLocal(&ret)) {
424+
return Intercepted::kNo;
426425
}
427-
return Intercepted::kNo;
426+
info.GetReturnValue().Set(ret);
427+
return Intercepted::kYes;
428428
}
429429

430430
static Intercepted EnvSetter(Local<Name> property,

0 commit comments

Comments
 (0)