Skip to content

Platform: Windows #6935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Kelmar wants to merge 1 commit into from
Closed

Platform: Windows #6935

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Platform: Windows 
Arch: x64
Compiler: VS2015

When running node with --evail or --require without the required argument,
node would segfault.  This should correct that and display a reasonable
error message again.
  • Loading branch information
Bryce Simonds committed May 23, 2016
commit d2fc83449054361d949e6e58ccc8d4feb33447bf
8 changes: 4 additions & 4 deletions src/node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3558,11 +3558,11 @@ static void ParseArgs(int* argc,
// --eval, -e and -pe always require an argument.
if (is_eval == true) {
args_consumed += 1;
eval_string = argv[index + 1];
if (eval_string == nullptr) {
if ((index + 1) >= nargs) {
fprintf(stderr, "%s: %s requires an argument\n", argv[0], arg);
exit(9);
}
eval_string = argv[index + 1];
} else if ((index + 1 < nargs) &&
argv[index + 1] != nullptr &&
argv[index + 1][0] != '-') {
Expand All @@ -3575,11 +3575,11 @@ static void ParseArgs(int* argc,
}
} else if (strcmp(arg, "--require") == 0 ||
strcmp(arg, "-r") == 0) {
const char* module = argv[index + 1];
if (module == nullptr) {
if ((index + 1) >= nargs) {
fprintf(stderr, "%s: %s requires an argument\n", argv[0], arg);
exit(9);
}
const char* module = argv[index + 1];
args_consumed += 1;
local_preload_modules[preload_module_count++] = module;
} else if (strcmp(arg, "--check") == 0 || strcmp(arg, "-c") == 0) {
Expand Down