src: remove fixed-size GetHumanReadableProcessName

Remove the version of GetHumanReadableProcessName() that operates on a fixed-size buffer. The only remaining caller is Assert() which might get called in contexts where dynamically allocating memory isn't possible but as Assert() calls printf(), which also allocates memory when necessary, this commit is unlikely to make matters much worse. PR-URL: #31633 Fixes: #31631 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: David Carlier <[email protected]> Reviewed-By: Rich Trott <[email protected]>
nodejs · Mar 17, 2020 · 99eebee · 99eebee
1 parent fb53a83
commit 99eebee
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/src/node_errors.cc b/src/node_errors.cc
@@ -242,12 +242,11 @@ void AppendExceptionLine(Environment* env,
 }
 
 [[noreturn]] void Assert(const AssertionInfo& info) {
-  char name[1024];
-  GetHumanReadableProcessName(&name);
+  std::string name = GetHumanReadableProcessName();
 
   fprintf(stderr,
           "%s: %s:%s%s Assertion `%s' failed.\n",
-          name,
+          name.c_str(),
           info.file_line,
           info.function,
           *info.function ? ":" : "",

diff --git a/src/node_internals.h b/src/node_internals.h
@@ -100,7 +100,6 @@ void RegisterSignalHandler(int signal,
 
 std::string GetProcessTitle(const char* default_title);
 std::string GetHumanReadableProcessName();
-void GetHumanReadableProcessName(char (*name)[1024]);
 
 void InitializeContextRuntime(v8::Local<v8::Context>);
 

diff --git a/src/util.cc b/src/util.cc
@@ -161,13 +161,6 @@ std::string GetHumanReadableProcessName() {
   return SPrintF("%s[%d]", GetProcessTitle("Node.js"), uv_os_getpid());
 }
 
-void GetHumanReadableProcessName(char (*name)[1024]) {
-  // Leave room after title for pid, which can be up to 20 digits for 64 bit.
-  char title[1000] = "Node.js";
-  uv_get_process_title(title, sizeof(title));
-  snprintf(*name, sizeof(*name), "%s[%d]", title, uv_os_getpid());
-}
-
 std::vector<std::string> SplitString(const std::string& in, char delim) {
   std::vector<std::string> out;
   if (in.empty())