os: fix memory leak in userInfo()

This previously leaked memory in the ‘success’ case. PR-URL: #23893 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Nov 1, 2018 · 3e512f1 · 3e512f1
1 parent cc65fee
commit 3e512f1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/node_os.cc b/src/node_os.cc
@@ -368,6 +368,8 @@ static void GetUserInfo(const FunctionCallbackInfo<Value>& args) {
     return args.GetReturnValue().SetUndefined();
   }
 
+  OnScopeLeave free_passwd([&]() { uv_os_free_passwd(&pwd); });
+
   Local<Value> error;
 
   Local<Value> uid = Number::New(env->isolate(), pwd.uid);
@@ -389,7 +391,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;
   }