src: Handle NULL env scenario by HarshithaKP · Pull Request #31899 · nodejs/node · GitHub
Skip to content

src: Handle NULL env scenario #31899

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

Closed
HarshithaKP wants to merge 2 commits into from
Closed

src: Handle NULL env scenario #31899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8069174
src: Handle NULL env scenario
HarshithaKP Feb 21, 2020
a2b8310
fixup: address review comment
HarshithaKP Mar 5, 2020
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
7 changes: 7 additions & 0 deletions doc/api/errors.md
View file
Open in desktop
13 changes: 11 additions & 2 deletions src/module_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,12 @@ MaybeLocal<Module> ModuleWrap::ResolveCallback(Local<Context> context,
Local<String> specifier,
Local<Module> referrer) {
Environment* env = Environment::GetCurrent(context);
CHECK_NOT_NULL(env); // TODO(addaleax): Handle nullptr here.
if (env == nullptr) {
Isolate* isolate = context->GetIsolate();
THROW_ERR_EXECUTION_ENVIRONMENT_NOT_AVAILABLE(isolate);
Comment thread
addaleax marked this conversation as resolved.
Outdated
return MaybeLocal<Module>();
}

Isolate* isolate = env->isolate();

ModuleWrap* dependent = GetFromModule(env, referrer);
Expand Down Expand Up @@ -1443,7 +1448,11 @@ static MaybeLocal<Promise> ImportModuleDynamically(
Local<String> specifier) {
Isolate* iso = context->GetIsolate();
Environment* env = Environment::GetCurrent(context);
CHECK_NOT_NULL(env); // TODO(addaleax): Handle nullptr here.
if (env == nullptr) {
THROW_ERR_EXECUTION_ENVIRONMENT_NOT_AVAILABLE(iso);
return MaybeLocal<Promise>();
}

EscapableHandleScope handle_scope(iso);

Local<Function> import_callback =
Expand Down
47 changes: 25 additions & 22 deletions src/node_errors.h
View file
Open in desktop