Skip to content

src: fix crash in GetErrorSource() for invalid using syntax #62770

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

Open
semimikoh wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −2
Open

src: fix crash in GetErrorSource() for invalid using syntax #62770

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/node_errors.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,7 @@ static std::string GetErrorSource(Isolate* isolate,
: 0;
int start = message->GetStartColumn(context).FromMaybe(0);
int end = message->GetEndColumn(context).FromMaybe(0);
if (start >= script_start) {
CHECK_GE(end, start);
if (start >= script_start && end >= script_start) {
start -= script_start;
end -= script_start;
}
Expand All @@ -163,6 +162,7 @@ static std::string GetErrorSource(Isolate* isolate,

if (start > end ||
start < 0 ||
end < 0 ||
static_cast<size_t>(end) > sourceline.size()) {
return buf;
}
Expand Down
23 changes: 23 additions & 0 deletions test/parallel/test-cli-eval-invalid-using.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
'use strict';

require('../common');
const assert = require('assert');
const { spawnSyncAndAssert } = require('../common/child_process');

[
'{using x=null, []=null;}',
'{using x=null, {}=null;}',
'async function f() { { await using x=null, []=null; } }',
'async function f() { { await using x=null, {}=null; } }',
].forEach((script) => {
spawnSyncAndAssert(process.execPath, ['--eval', script], {
status: 1,
signal: null,
stderr(output) {
assert.match(output, /SyntaxError/);
assert.doesNotMatch(output, /Assertion failed/);
assert.doesNotMatch(output, /Native stack trace/);
},
stdout: '',
});
});
Loading