CR

Signed-off-by: Romy <[email protected]>

Author: romayalon

src/native/fs/fs_napi.cpp

@@ -168,6 +168,7 @@ typedef std::map<std::string, std::string> XattrMap;
 const char* gpfs_dl_path = std::getenv("GPFS_DL_PATH");
 
 int gpfs_lib_file_exists = -1;
+long PASSWD_BUF_SIZE = -1;
 
 static int (*dlsym_gpfs_fcntl)(gpfs_file_t file, void* arg) = 0;
 
@@ -1399,26 +1400,22 @@ struct GetPwName : public FSWorker
     std::string _user;
     struct passwd pwd;
     struct passwd *_getpwnam_res;
-    char *buf;
     GetPwName(const Napi::CallbackInfo& info)
         : FSWorker(info)
     {
         _user = info[1].As<Napi::String>();
+        _getpwnam_res = NULL;
         Begin(XSTR() << "GetPwName " << DVAL(_user));
     }
     virtual void Work()
     {
-        long bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
-        if (bufsize == -1) {
-            bufsize = 16384;
-        }       
+        std::unique_ptr<char[]> buf = std::unique_ptr<char[]>(new char[PASSWD_BUF_SIZE]);
 
-        buf = (char *)malloc(bufsize);
         if (buf == NULL) {
             SetSyscallError();
             return;
         }
-        int rc = getpwnam_r(_user.c_str(), &pwd, buf, bufsize, &_getpwnam_res);
+        int rc = getpwnam_r(_user.c_str(), &pwd, buf.get(), PASSWD_BUF_SIZE, &_getpwnam_res);
         if (rc != 0) {
             SetSyscallError();
             return;
@@ -1434,12 +1431,6 @@ struct GetPwName : public FSWorker
         set_getpwnam_res(env, res, *_getpwnam_res);
         _deferred.Resolve(res);
     }
-
-    ~GetPwName()
-    {
-        free(buf); 
-    }
-
 };
 
 struct FileWrap : public Napi::ObjectWrap<FileWrap>
@@ -2424,6 +2415,12 @@ fs_napi(Napi::Env env, Napi::Object exports)
     exports_fs["DT_DIR"] = Napi::Number::New(env, DT_DIR);
     exports_fs["DT_LNK"] = Napi::Number::New(env, DT_LNK);
     exports_fs["PLATFORM_IOV_MAX"] = Napi::Number::New(env, IOV_MAX);
+    long passwd_bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
+    if (passwd_bufsize == -1) {
+        passwd_bufsize = 16384;
+    }
+    PASSWD_BUF_SIZE = passwd_bufsize;
+
 
 #ifdef O_DIRECT
     exports_fs["O_DIRECT"] = Napi::Number::New(env, O_DIRECT);
@@ -2437,6 +2434,7 @@ fs_napi(Napi::Env env, Napi::Object exports)
     exports_fs["set_log_config"] = Napi::Function::New(env, set_log_config);
 
     exports["fs"] = exports_fs;
+
 }
 
 } // namespace noobaa