Skip to content
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

os: fix memory leak in userInfo() #23893

Closed
wants to merge 2 commits into from
Closed

os: fix memory leak in userInfo() #23893

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d0c4f8
os: fix memory leak in `userInfo()`
addaleax Oct 26, 2018
21e0e86
fixup! os: fix memory leak in `userInfo()`
addaleax Oct 26, 2018
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
2 changes: 1 addition & 1 deletion src/node_os.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ static void GetUserInfo(const FunctionCallbackInfo<Value>& args) {
}

const int err = uv_os_get_passwd(&pwd);
OnScopeLeave free_passwd([&]() { uv_os_free_passwd(&pwd); });
Copy link
Member

Choose a reason for hiding this comment

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

is it safe to call it if uv_os_get_passwd returned an error?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, I think you’re right, we shouldn’t do that. I’ve moved it below the conditional 👍


if (err) {
CHECK_GE(args.Length(), 2);
Expand Down Expand Up @@ -389,7 +390,6 @@ static void GetUserInfo(const FunctionCallbackInfo<Value>& args) {

if (username.IsEmpty() || homedir.IsEmpty() || shell.IsEmpty()) {
CHECK(!error.IsEmpty());
uv_os_free_passwd(&pwd);
env->isolate()->ThrowException(error);
return;
}
Expand Down