Skip to content

vm: support negative number lineOffset and columnOffset #48169

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
sinkhaha wants to merge 4 commits into from
Closed

vm: support negative number lineOffset and columnOffset #48169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bca32a
vm: refactor to use 'validateInt32' to verify lineOffset
sinkhaha May 25, 2023
88bca65
vm: add lineOffset test
sinkhaha May 25, 2023
8703f4a
vm: refactor to use 'validateInt32' to verify columnOffset
sinkhaha May 25, 2023
0682305
Merge branch 'nodejs:main' into vm-compilefunction-lineoffset
sinkhaha May 25, 2023
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
6 changes: 3 additions & 3 deletions lib/internal/vm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const {
validateObject,
validateString,
validateStringArray,
validateUint32,
validateInt32,
} = require('internal/validators');
const {
ERR_INVALID_ARG_TYPE,
Expand Down Expand Up @@ -46,8 +46,8 @@ function internalCompileFunction(code, params, options) {
} = options;

validateString(filename, 'options.filename');
validateUint32(columnOffset, 'options.columnOffset');
validateUint32(lineOffset, 'options.lineOffset');
validateInt32(columnOffset, 'options.columnOffset');
validateInt32(lineOffset, 'options.lineOffset');
if (cachedData !== undefined)
validateBuffer(cachedData, 'options.cachedData');
validateBoolean(produceCachedData, 'options.produceCachedData');
Expand Down
33 changes: 33 additions & 0 deletions test/parallel/test-vm-basic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,28 @@ const vm = require('vm');
// Setting value to run the last three tests
Error.stackTraceLimit = 1;

assert.throws(() => {
vm.compileFunction(
'throw new Error("Sample Error")',
[],
{ lineOffset: -1 }
)();
}, {
message: 'Sample Error',
stack: 'Error: Sample Error\n at <anonymous>'
});

assert.throws(() => {
vm.compileFunction(
'throw new Error("Sample Error")',
[],
{ lineOffset: -2 }
)();
}, {
message: 'Sample Error',
stack: 'Error: Sample Error\n at <anonymous>:-1:7'
});

assert.throws(() => {
vm.compileFunction('throw new Error("Sample Error")')();
}, {
Expand All @@ -272,6 +294,17 @@ const vm = require('vm');
stack: 'Error: Sample Error\n at <anonymous>:4:7'
});

assert.throws(() => {
vm.compileFunction(
'throw new Error("Sample Error")',
[],
{ columnOffset: -1 }
)();
}, {
message: 'Sample Error',
stack: 'Error: Sample Error\n at <anonymous>:1:6'
});

assert.throws(() => {
vm.compileFunction(
'throw new Error("Sample Error")',
Expand Down