From 33b09066403d6e87e72ff5fe32c6534f74e72ffa Mon Sep 17 00:00:00 2001 From: Darshan Sen Date: Mon, 3 Apr 2023 12:37:49 +0530 Subject: [PATCH] sea: fix memory leak detected by asan Signed-off-by: Darshan Sen PR-URL: https://github.com/nodejs/node/pull/47309 Reviewed-By: Yagiz Nizipli Reviewed-By: Colin Ihrig Reviewed-By: Mohammed Keyvanzadeh Reviewed-By: Joyee Cheung Reviewed-By: Michael Dawson Reviewed-By: James M Snell --- src/node_sea.cc | 20 +++++++------------ .../test-single-executable-application.js | 5 ----- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/node_sea.cc b/src/node_sea.cc index 18b661ce4ff31d..fa7fb86b0ed05c 100644 --- a/src/node_sea.cc +++ b/src/node_sea.cc @@ -91,19 +91,13 @@ std::tuple 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 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 index 902093dc6e412d..9ceb61883e1664 100644 --- 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"`.');