Skip to content

src: improve error handling in node_env_var.cc #57767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 7, 2025
+5 −6
Merged

src: improve error handling in node_env_var.cc #57767

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/node_env_var.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,15 +436,14 @@ static Intercepted EnvGetter(Local<Name> property,
MaybeLocal<String> value_string =
env->env_vars()->Get(env->isolate(), property.As<String>());

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

if (has_env) {
// ToLocalChecked here is ok since we check IsEmpty above.
info.GetReturnValue().Set(value_string.ToLocalChecked());
return Intercepted::kYes;
Local<Value> ret;
if (!value_string.ToLocal(&ret)) {
return Intercepted::kNo;
}
return Intercepted::kNo;
info.GetReturnValue().Set(ret);
return Intercepted::kYes;
}

static Intercepted EnvSetter(Local<Name> property,
Expand Down
Loading