sea: fix memory leak detected by asan

Signed-off-by: Darshan Sen <[email protected]> PR-URL: #47309 Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Mohammed Keyvanzadeh <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Apr 3, 2023 · 5db08cf · 5db08cf
1 parent eef1304
commit 5db08cf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/src/node_sea.cc b/src/node_sea.cc
@@ -17,6 +17,7 @@
 #include <memory>
 #include <string_view>
 #include <tuple>
+#include <vector>
 
 #if !defined(DISABLE_SINGLE_EXECUTABLE_APPLICATION)
 
@@ -60,19 +61,13 @@ std::tuple<int, char**> FixupArgsForSEA(int argc, char** argv) {
   // Repeats argv[0] at position 1 on argv as a replacement for the missing
   // entry point file path.
   if (IsSingleExecutable()) {
-    char** new_argv = new char*[argc + 2];
-    int new_argc = 0;
-    new_argv[new_argc++] = argv[0];
-    new_argv[new_argc++] = argv[0];
-
-    for (int i = 1; i < argc; ++i) {
-      new_argv[new_argc++] = argv[i];
-    }
-
-    new_argv[new_argc] = nullptr;
-
-    argc = new_argc;
-    argv = new_argv;
+    static std::vector<char*> new_argv;
+    new_argv.reserve(argc + 2);
+    new_argv.emplace_back(argv[0]);
+    new_argv.insert(new_argv.end(), argv, argv + argc);
+    new_argv.emplace_back(nullptr);
+    argc = new_argv.size() - 1;
+    argv = new_argv.data();
   }
 
   return {argc, argv};

diff --git a/test/parallel/test-single-executable-application.js b/test/parallel/test-single-executable-application.js
@@ -16,11 +16,6 @@ if (!process.config.variables.single_executable_application)
 if (!['darwin', 'win32', 'linux'].includes(process.platform))
   common.skip(`Unsupported platform ${process.platform}.`);
 
-if (process.platform === 'linux' && process.config.variables.asan) {
-  // Source of the memory leak - https://github.com/nodejs/node/blob/da0bc6db98cef98686122ea1e2cd2dbd2f52d123/src/node_sea.cc#L94.
-  common.skip('Running the resultant binary fails because of a memory leak ASAN error.');
-}
-
 if (process.platform === 'linux' && process.config.variables.is_debug === 1)
   common.skip('Running the resultant binary fails with `Couldn\'t read target executable"`.');