src: fix undefined script name in error source

nodejs · Jan 7, 2025 · 3f9f17c · 3f9f17c
1 parent 52c6449
commit 3f9f17c
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 2 deletions.
diff --git a/src/node_errors.cc b/src/node_errors.cc
@@ -136,8 +136,13 @@ static std::string GetErrorSource(Isolate* isolate,
 
   // Print (filename):(line number): (message).
   ScriptOrigin origin = message->GetScriptOrigin();
-  node::Utf8Value filename(isolate, message->GetScriptResourceName());
-  const char* filename_string = *filename;
+  std::string filename_string;
+  if (message->GetScriptResourceName()->IsUndefined()) {
+    filename_string = "<unnamed_script>";
+  } else {
+    node::Utf8Value filename(isolate, message->GetScriptResourceName());
+    filename_string = filename.ToString();
+  }
   int linenum = message->GetLineNumber(context).FromJust();
 
   int script_start = (linenum - origin.LineOffset()) == 1

diff --git a/test/fixtures/errors/throw_in_eval_named.js b/test/fixtures/errors/throw_in_eval_named.js
diff --git a/test/fixtures/errors/throw_in_eval_named.snapshot b/test/fixtures/errors/throw_in_eval_named.snapshot
@@ -0,0 +1,8 @@
+evalscript.js:*
+  throw new Error('error in named script');
+  ^
+
+Error: error in named script
+    at eval (evalscript.js:*:*)
+
+Node.js *
diff --git a/test/fixtures/errors/throw_in_eval_unnamed.js b/test/fixtures/errors/throw_in_eval_unnamed.js
@@ -0,0 +1,9 @@
+'use strict';
+require('../../common');
+
+Error.stackTraceLimit = 1;
+eval(`
+
+  throw new Error('error in unnamed script');
+
+`)
diff --git a/test/fixtures/errors/throw_in_eval_unnamed.snapshot b/test/fixtures/errors/throw_in_eval_unnamed.snapshot
@@ -0,0 +1,8 @@
+<unnamed_script>:*
+  throw new Error('error in unnamed script');
+  ^
+
+Error: error in unnamed script
+    at eval (eval at <anonymous> (*throw_in_eval_unnamed.js:*:*), <anonymous>:*:*)
+
+Node.js *
diff --git a/test/parallel/test-node-output-errors.mjs b/test/parallel/test-node-output-errors.mjs
@@ -63,6 +63,8 @@ describe('errors output', { concurrency: !process.env.TEST_PARALLEL }, () => {
     { name: 'errors/if-error-has-good-stack.js', transform: errTransform },
     { name: 'errors/throw_custom_error.js', transform: errTransform },
     { name: 'errors/throw_error_with_getter_throw.js', transform: errTransform },
+    { name: 'errors/throw_in_eval_named.js', transform: errTransform },
+    { name: 'errors/throw_in_eval_unnamed.js', transform: errTransform },
     { name: 'errors/throw_in_line_with_tabs.js', transform: errTransform },
     { name: 'errors/throw_non_error.js', transform: errTransform },
     { name: 'errors/throw_null.js', transform: errTransform },