FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

src: fix undefined script name in error source · nodejs/node@50c65ee · GitHub

/ node Public

Commit 50c65ee

Browse files
legendecas
authored and
aduh95
committed
src: fix undefined script name in error source
PR-URL: #56502 Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent b3c66d2 commit 50c65ee

6 files changed

Lines changed: 43 additions & 2 deletions

File tree

‎src/node_errors.cc‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,13 @@ static std::string GetErrorSource(Isolate* isolate,
136136

137137
// Print (filename):(line number): (message).
138138
ScriptOrigin origin = message->GetScriptOrigin();
139-
node::Utf8Value filename(isolate, message->GetScriptResourceName());
140-
const char* filename_string = *filename;
139+
std::string filename_string;
140+
if (message->GetScriptResourceName()->IsUndefined()) {
141+
filename_string = "<anonymous_script>";
142+
} else {
143+
node::Utf8Value filename(isolate, message->GetScriptResourceName());
144+
filename_string = filename.ToString();
145+
}
141146
int linenum = message->GetLineNumber(context).FromJust();
142147

143148
int script_start = (linenum - origin.LineOffset()) == 1

‎test/fixtures/errors/throw_in_eval_anonymous.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
'use strict';
2+
require('../../common');
3+
4+
Error.stackTraceLimit = 1;
5+
eval(`
6+
7+
throw new Error('error in anonymous script');
8+
9+
`)

‎test/fixtures/errors/throw_in_eval_anonymous.snapshot‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<anonymous_script>:*
2+
throw new Error('error in anonymous script');
3+
^
4+
5+
Error: error in anonymous script
6+
at eval (eval at <anonymous> (*throw_in_eval_anonymous.js:*:*), <anonymous>:*:*)
7+
8+
Node.js *

‎test/fixtures/errors/throw_in_eval_named.js‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/fixtures/errors/throw_in_eval_named.snapshot‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
evalscript.js:*
2+
throw new Error('error in named script');
3+
^
4+
5+
Error: error in named script
6+
at eval (evalscript.js:*:*)
7+
8+
Node.js *

‎test/parallel/test-node-output-errors.mjs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ describe('errors output', { concurrency: !process.env.TEST_PARALLEL }, () => {
6363
{ name: 'errors/if-error-has-good-stack.js', transform: errTransform },
6464
{ name: 'errors/throw_custom_error.js', transform: errTransform },
6565
{ name: 'errors/throw_error_with_getter_throw.js', transform: errTransform },
66+
{ name: 'errors/throw_in_eval_anonymous.js', transform: errTransform },
67+
{ name: 'errors/throw_in_eval_named.js', transform: errTransform },
6668
{ name: 'errors/throw_in_line_with_tabs.js', transform: errTransform },
6769
{ name: 'errors/throw_non_error.js', transform: errTransform },
6870
{ name: 'errors/throw_null.js', transform: errTransform },

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL