Skip to content

src: remove empty name check in node_env_var.cc #36133

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
RaisinTen wants to merge 1 commit into from
+1 −3
Closed

src: remove empty name check in node_env_var.cc #36133

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
src: remove empty name check in node_env_var.cc 
The empty name check has been removed since this has landed:
libuv/libuv#2473
  • Loading branch information
@RaisinTen
RaisinTen committed Dec 13, 2020
commit 76ae744f3cb04cfd735697cad27d14a4041c2522
4 changes: 1 addition & 3 deletions src/node_env_var.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,7 @@ Local<Array> RealEnvStore::Enumerate(Isolate* isolate) const {
for (int i = 0; i < count; i++) {
#ifdef _WIN32
// If the key starts with '=' it is a hidden environment variable.
Copy link
Copy Markdown
Member

@addaleax addaleax Dec 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’m not sure why this line is being removed, though?

Copy link
Copy Markdown
Member Author

@RaisinTen RaisinTen Dec 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, I'll add that back in. Thanks for reviewing. :)

Copy link
Copy Markdown
Member Author

@RaisinTen RaisinTen Dec 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

// The '\0' check is a workaround for the bug behind
// https://github.com/libuv/libuv/pull/2473 and can be removed later.
if (items[i].name[0] == '=' || items[i].name[0] == '\0') continue;
if (items[i].name[0] == '=') continue;
#endif
MaybeLocal<String> str = String::NewFromUtf8(isolate, items[i].name);
if (str.IsEmpty()) {
Expand Down