nodejs
diff --git a/Collapse file
‎src/node_main.cc‎
Copy file name to clipboardExpand all lines: src/node_main.cc
+2-1Lines changed: 2 additions & 1 deletion b/Collapse file
‎src/node_main.cc‎
Copy file name to clipboardExpand all lines: src/node_main.cc
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/Collapse file
‎test/parallel/test-cli-eval.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-cli-eval.js
+8-2Lines changed: 8 additions & 2 deletions b/Collapse file
‎test/parallel/test-cli-eval.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-cli-eval.js
+8-2Lines changed: 8 additions & 2 deletions
@@ -3,7 +3,7 @@
 #ifdef _WIN32
 int wmain(int argc, wchar_t *wargv[]) {
   // Convert argv to to UTF8
-  char** argv = new char*[argc];
+  char** argv = new char*[argc + 1];
   for (int i = 0; i < argc; i++) {
     // Compute the size of the required buffer
     DWORD size = WideCharToMultiByte(CP_UTF8,
@@ -35,6 +35,7 @@ int wmain(int argc, wchar_t *wargv[]) {
       exit(1);
     }
   }
+  argv[argc] = nullptr;
   // Now that conversion is done, we can finally start.
   return node::Start(argc, argv);
 }
 
@@ -40,11 +40,11 @@ child.exec(nodejs + ' --eval "console.error(42)"',
         assert.equal(stderr, '');
       });
 
-  child.exec(cmd + "'[]'",
+  child.exec(cmd + "'[]'", common.mustCall(
       function(err, stdout, stderr) {
         assert.equal(stdout, '[]\n');
         assert.equal(stderr, '');
-      });
+      }));
 });
 
 // assert that module loading works
@@ -59,6 +59,12 @@ child.exec(nodejs + ' --eval "require(\'./test/parallel/test-cli-eval.js\')"',
       assert.equal(status.code, 42);
     });
 
+// Missing argument should not crash
+child.exec(nodejs + ' -e', common.mustCall(function(status, stdout, stderr) {
+  assert.notStrictEqual(status, null);
+  assert.strictEqual(status.code, 9);
+}));
+
 // empty program should do nothing
 child.exec(nodejs + ' -e ""', function(status, stdout, stderr) {
   assert.equal(stdout, '');
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#ifdef _WIN32`
`4`	`4`	`int wmain(int argc, wchar_t *wargv[]) {`
`5`	`5`	`// Convert argv to to UTF8`
`6`		`- char** argv = new char*[argc];`
	`6`	`+ char** argv = new char*[argc + 1];`
`7`	`7`	`for (int i = 0; i < argc; i++) {`
`8`	`8`	`// Compute the size of the required buffer`
`9`	`9`	`DWORD size = WideCharToMultiByte(CP_UTF8,`
`@@ -35,6 +35,7 @@ int wmain(int argc, wchar_t *wargv[]) {`
`35`	`35`	`exit(1);`
`36`	`36`	`}`
`37`	`37`	`}`
	`38`	`+ argv[argc] = nullptr;`
`38`	`39`	`// Now that conversion is done, we can finally start.`
`39`	`40`	`return node::Start(argc, argv);`
`40`	`41`	`}`