src: only delete[] on Windows

Author: CGQAQ

src/node_sea.cc

@@ -271,7 +271,9 @@ std::tuple<int, char**> FixupArgsForSEA(int argc, char** argv) {
     new_argv.emplace_back(argv[0]);
     new_argv.insert(new_argv.end(), argv, argv + argc);
     new_argv.emplace_back(nullptr);
+#ifdef _WIN32
     delete[] argv;
+#endif
     argc = new_argv.size() - 1;
     argv = new_argv.data();
   }

test/common/sea.js

@@ -6,9 +6,7 @@ const tmpdir = require('../common/tmpdir');
 const { inspect } = require('util');
 
 const { readFileSync, copyFileSync, statSync } = require('fs');
-const {
-  spawnSyncAndExitWithoutError,
-} = require('../common/child_process');
+const { spawnSyncAndExitWithoutError } = require('../common/child_process');
 
 function skipIfSingleExecutableIsNotSupported() {
   if (!process.config.variables.single_executable_application)
@@ -18,31 +16,48 @@ function skipIfSingleExecutableIsNotSupported() {
     common.skip(`Unsupported platform ${process.platform}.`);
 
   if (process.platform === 'linux' && process.config.variables.is_debug === 1)
-    common.skip('Running the resultant binary fails with `Couldn\'t read target executable"`.');
+    common.skip(
+      'Running the resultant binary fails with `Couldn\'t read target executable"`.'
+    );
 
   if (process.config.variables.node_shared)
-    common.skip('Running the resultant binary fails with ' +
-      '`/home/iojs/node-tmp/.tmp.2366/sea: error while loading shared libraries: ' +
-      'libnode.so.112: cannot open shared object file: No such file or directory`.');
+    common.skip(
+      'Running the resultant binary fails with ' +
+        '`/home/iojs/node-tmp/.tmp.2366/sea: error while loading shared libraries: ' +
+        'libnode.so.112: cannot open shared object file: No such file or directory`.'
+    );
 
   if (process.config.variables.icu_gyp_path === 'tools/icu/icu-system.gyp')
-    common.skip('Running the resultant binary fails with ' +
-      '`/home/iojs/node-tmp/.tmp.2379/sea: error while loading shared libraries: ' +
-      'libicui18n.so.71: cannot open shared object file: No such file or directory`.');
-
-  if (!process.config.variables.node_use_openssl || process.config.variables.node_shared_openssl)
-    common.skip('Running the resultant binary fails with `Node.js is not compiled with OpenSSL crypto support`.');
+    common.skip(
+      'Running the resultant binary fails with ' +
+        '`/home/iojs/node-tmp/.tmp.2379/sea: error while loading shared libraries: ' +
+        'libicui18n.so.71: cannot open shared object file: No such file or directory`.'
+    );
+
+  if (
+    !process.config.variables.node_use_openssl ||
+    process.config.variables.node_shared_openssl
+  )
+    common.skip(
+      'Running the resultant binary fails with `Node.js is not compiled with OpenSSL crypto support`.'
+    );
 
   if (process.config.variables.want_separate_host_toolset !== 0)
-    common.skip('Running the resultant binary fails with `Segmentation fault (core dumped)`.');
+    common.skip(
+      'Running the resultant binary fails with `Segmentation fault (core dumped)`.'
+    );
 
   if (process.platform === 'linux') {
-    const osReleaseText = readFileSync('/etc/os-release', { encoding: 'utf-8' });
+    const osReleaseText = readFileSync('/etc/os-release', {
+      encoding: 'utf-8',
+    });
     const isAlpine = /^NAME="Alpine Linux"/m.test(osReleaseText);
     if (isAlpine) common.skip('Alpine Linux is not supported.');
 
     if (process.arch === 's390x') {
-      common.skip('On s390x, postject fails with `memory access out of bounds`.');
+      common.skip(
+        'On s390x, postject fails with `memory access out of bounds`.'
+      );
     }
   }
 
@@ -54,7 +69,9 @@ function skipIfSingleExecutableIsNotSupported() {
     readFileSync(process.execPath);
   } catch (e) {
     if (e.code === 'ERR_FS_FILE_TOO_LARGE') {
-      common.skip('The Node.js binary is too large to be supported by postject');
+      common.skip(
+        'The Node.js binary is too large to be supported by postject'
+      );
     }
   }
 
@@ -66,34 +83,54 @@ function skipIfSingleExecutableIsNotSupported() {
   const stat = statSync(process.execPath);
   const expectedSpace = stat.size + 10 * 1024 * 1024;
   if (!tmpdir.hasEnoughSpace(expectedSpace)) {
-    common.skip(`Available disk space < ${Math.floor(expectedSpace / 1024 / 1024)} MB`);
+    common.skip(
+      `Available disk space < ${Math.floor(expectedSpace / 1024 / 1024)} MB`
+    );
   }
 }
 
-function generateSEA(targetExecutable, sourceExecutable, seaBlob, verifyWorkflow = false) {
+function generateSEA(
+  targetExecutable,
+  sourceExecutable,
+  seaBlob,
+  verifyWorkflow = false
+) {
   try {
     copyFileSync(sourceExecutable, targetExecutable);
   } catch (e) {
-    const message = `Cannot copy ${sourceExecutable} to ${targetExecutable}: ${inspect(e)}`;
+    const message = `Cannot copy ${sourceExecutable} to ${targetExecutable}: ${inspect(
+      e
+    )}`;
     if (verifyWorkflow) {
       throw new Error(message);
     }
     common.skip(message);
   }
   console.log(`Copied ${sourceExecutable} to ${targetExecutable}`);
 
-  const postjectFile = fixtures.path('postject-copy', 'node_modules', 'postject', 'dist', 'cli.js');
+  const postjectFile = fixtures.path(
+    'postject-copy',
+    'node_modules',
+    'postject',
+    'dist',
+    'cli.js'
+  );
   try {
     spawnSyncAndExitWithoutError(process.execPath, [
       postjectFile,
       targetExecutable,
       'NODE_SEA_BLOB',
       seaBlob,
-      '--sentinel-fuse', 'NODE_SEA_FUSE_fce680ab2cc467b6e072b8b5df1996b2',
-      ...process.platform === 'darwin' ? [ '--macho-segment-name', 'NODE_SEA' ] : [],
+      '--sentinel-fuse',
+      'NODE_SEA_FUSE_fce680ab2cc467b6e072b8b5df1996b2',
+      ...(process.platform === 'darwin'
+        ? ['--macho-segment-name', 'NODE_SEA']
+        : []),
     ]);
   } catch (e) {
-    const message = `Cannot inject ${seaBlob} into ${targetExecutable}: ${inspect(e)}`;
+    const message = `Cannot inject ${seaBlob} into ${targetExecutable}: ${inspect(
+      e
+    )}`;
     if (verifyWorkflow) {
       throw new Error(message);
     }
@@ -103,8 +140,12 @@ function generateSEA(targetExecutable, sourceExecutable, seaBlob, verifyWorkflow
 
   if (process.platform === 'darwin') {
     try {
-      spawnSyncAndExitWithoutError('codesign', [ '--sign', '-', targetExecutable ]);
-      spawnSyncAndExitWithoutError('codesign', [ '--verify', targetExecutable ]);
+      spawnSyncAndExitWithoutError('codesign', [
+        '--sign',
+        '-',
+        targetExecutable,
+      ]);
+      spawnSyncAndExitWithoutError('codesign', ['--verify', targetExecutable]);
     } catch (e) {
       const message = `Cannot sign ${targetExecutable}: ${inspect(e)}`;
       if (verifyWorkflow) {
@@ -115,7 +156,7 @@ function generateSEA(targetExecutable, sourceExecutable, seaBlob, verifyWorkflow
     console.log(`Signed ${targetExecutable}`);
   } else if (process.platform === 'win32') {
     try {
-      spawnSyncAndExitWithoutError('where', [ 'signtool' ]);
+      spawnSyncAndExitWithoutError('where', ['signtool']);
     } catch (e) {
       const message = `Cannot find signtool: ${inspect(e)}`;
       if (verifyWorkflow) {
@@ -125,10 +166,22 @@ function generateSEA(targetExecutable, sourceExecutable, seaBlob, verifyWorkflow
     }
     let stderr;
     try {
-      ({ stderr } = spawnSyncAndExitWithoutError('signtool', [ 'sign', '/fd', 'SHA256', targetExecutable ]));
-      spawnSyncAndExitWithoutError('signtool', ['verify', '/pa', 'SHA256', targetExecutable]);
+      ({ stderr } = spawnSyncAndExitWithoutError('signtool', [
+        'sign',
+        '/fd',
+        'SHA256',
+        '/a',
+        targetExecutable,
+      ]));
+      spawnSyncAndExitWithoutError('signtool', [
+        'verify',
+        '/pa',
+        targetExecutable,
+      ]);
     } catch (e) {
-      const message = `Cannot sign ${targetExecutable}: ${inspect(e)}\n${stderr}`;
+      const message = `Cannot sign ${targetExecutable}: ${inspect(
+        e
+      )}\n${stderr}`;
       if (verifyWorkflow) {
         throw new Error(message);
       }