1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: fix ^ in stack trace with vm's columnOffset

Browse Source 
While VM module's columnOffset option does succeed in applying an offset
to the column number in the stack trace, the wavy diagram printed does
not account for potential offsets, resulting in erroneous location of
`^` in the first line of the script.

Before:

```
> vm.runInThisContext('throw new Error()', { columnOffset: 5 })
evalmachine.<anonymous>:1
throw new Error()
     ^

Error
    at evalmachine.<anonymous>:1:12
    at ContextifyScript.Script.runInThisContext (vm.js:44:33)
    at Object.runInThisContext (vm.js:116:38)
```

After:

```
> vm.runInThisContext('throw new Error()', { columnOffset: 5 })
evalmachine.<anonymous>:1
throw new Error()
^

Error
    at evalmachine.<anonymous>:1:12
    at ContextifyScript.Script.runInThisContext (vm.js:50:33)
    at Object.runInThisContext (vm.js:139:38)
    at repl:1:4
```

PR-URL: https://github.com/nodejs/node/pull/15771
Refs: https://github.com/tmpvar/jsdom/pull/2003
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
This commit is contained in:
Timothy Gu 2017-10-03 20:51:12 -07:00
parent d6031bc1c6
commit 3aea4c884b
No known key found for this signature in database
GPG Key ID: 7FE6B095B582B0D4
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/node.cc
View File

@ -1731,6 +1731,7 @@ void AppendExceptionLine(Environment* env,
} }
// Print (filename):(line number): (message). // Print (filename):(line number): (message).
ScriptOrigin origin = message->GetScriptOrigin();
node::Utf8Value filename(env->isolate(), message->GetScriptResourceName()); node::Utf8Value filename(env->isolate(), message->GetScriptResourceName());
const char* filename_string = *filename; const char* filename_string = *filename;
int linenum = message->GetLineNumber(); int linenum = message->GetLineNumber();
@ -1759,8 +1760,16 @@ void AppendExceptionLine(Environment* env,
// sourceline to 78 characters, and we end up not providing very much // sourceline to 78 characters, and we end up not providing very much
// useful debugging info to the user if we remove 62 characters. // useful debugging info to the user if we remove 62 characters.
int script_start =
(linenum - origin.ResourceLineOffset()->Value()) == 1 ?
origin.ResourceColumnOffset()->Value() : 0;
int start = message->GetStartColumn(env->context()).FromMaybe(0); int start = message->GetStartColumn(env->context()).FromMaybe(0);
int end = message->GetEndColumn(env->context()).FromMaybe(0); int end = message->GetEndColumn(env->context()).FromMaybe(0);
if (start >= script_start) {
CHECK_GE(end, start);
start -= script_start;
end -= script_start;
}
char arrow[1024]; char arrow[1024];
int max_off = sizeof(arrow) - 2; int max_off = sizeof(arrow) - 2;

5
test/parallel/test-vm-context.js
View File

@ -93,13 +93,14 @@ assert.strictEqual(script.runInContext(ctx), false);
// Error on the first line of a module should // Error on the first line of a module should
// have the correct line and column number // have the correct line and column number
assert.throws(() => { assert.throws(() => {
vm.runInContext('throw new Error()', context, { vm.runInContext(' throw new Error()', context, {
filename: 'expected-filename.js', filename: 'expected-filename.js',
lineOffset: 32, lineOffset: 32,
columnOffset: 123 columnOffset: 123
}); });
}, (err) => { }, (err) => {
return /expected-filename\.js:33:130/.test(err.stack); return /^ \^/m.test(err.stack) &&
/expected-filename\.js:33:131/.test(err.stack);
}, 'Expected appearance of proper offset in Error stack'); }, 'Expected appearance of proper offset in Error stack');
// https://github.com/nodejs/node/issues/6158 // https://github.com/nodejs/node/issues/6158