Commit 0c8797b2a64 for nodejs
commit 0c8797b2a649bb837d94622eda01130424c77940
Author: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu Nov 19 07:50:19 2026 -0800
module: don't map a trailing generated-only segment
The mappings parser detects a segment that has only a generated column
by peeking at the next character. At the end of the mappings string the
peek returns an empty string, which is not a separator, so a final
generated-only segment is decoded with phantom zero deltas and inherits
the source, line, and column of the segment before it. With
--enable-source-maps, stack frames in code after the last mapped
segment are then attributed to the last mapped source.
Check for the end of the string before reading source fields.
Signed-off-by: Jacky Zhao <j.zhao2k19@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/66264
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/lib/internal/source_map/source_map.js b/lib/internal/source_map/source_map.js
index c083dbc4a00..d1d801ce583 100644
--- a/lib/internal/source_map/source_map.js
+++ b/lib/internal/source_map/source_map.js
@@ -432,7 +432,8 @@ class SourceMap {
}
columnNumber += decodeVLQ(stringCharIterator);
- if (isSeparator(stringCharIterator.peek())) {
+ if (!stringCharIterator.hasNext() ||
+ isSeparator(stringCharIterator.peek())) {
this.#pushEntry(lineNumber, columnNumber, kNoSource, 0, 0, kNoName);
continue;
}
@@ -442,7 +443,8 @@ class SourceMap {
sourceColumnNumber += decodeVLQ(stringCharIterator);
let entryNameIndex = kNoName;
- if (!isSeparator(stringCharIterator.peek())) {
+ if (stringCharIterator.hasNext() &&
+ !isSeparator(stringCharIterator.peek())) {
nameIndex += decodeVLQ(stringCharIterator);
if (nameIndex >= 0 && nameIndex < names.length) {
entryNameIndex = nameBase + nameIndex;
diff --git a/test/parallel/test-source-map-trailing-unmapped-segment.js b/test/parallel/test-source-map-trailing-unmapped-segment.js
new file mode 100644
index 00000000000..d5c7243ad99
--- /dev/null
+++ b/test/parallel/test-source-map-trailing-unmapped-segment.js
@@ -0,0 +1,67 @@
+'use strict';
+require('../common');
+const assert = require('assert');
+const { SourceMap } = require('node:module');
+
+// A segment with only a generated column marks the code after it as unmapped.
+// When it is the last segment of the mappings, it must not inherit the
+// original position of the segment before it.
+const unmapped = {
+ originalSource: undefined,
+ originalLine: undefined,
+ originalColumn: undefined,
+ name: undefined,
+};
+
+// Trailing unmapped segment on the same line as the last mapped segment.
+{
+ const sm = new SourceMap({
+ version: 3,
+ sources: ['a.js'],
+ names: [],
+ mappings: 'AAAA,K',
+ });
+
+ assert.deepStrictEqual(sm.findEntry(0, 5), {
+ generatedLine: 0,
+ generatedColumn: 5,
+ ...unmapped,
+ });
+ assert.deepStrictEqual(sm.findOrigin(1, 6), {});
+}
+
+// Trailing unmapped segment on a later line.
+{
+ const sm = new SourceMap({
+ version: 3,
+ sources: ['a.js'],
+ names: [],
+ mappings: 'AAAA;A',
+ });
+
+ assert.deepStrictEqual(sm.findEntry(1, 3), {
+ generatedLine: 1,
+ generatedColumn: 0,
+ ...unmapped,
+ });
+ assert.deepStrictEqual(sm.findOrigin(2, 4), {});
+}
+
+// A segment without a name field must not pick up a name from the names array.
+{
+ const sm = new SourceMap({
+ version: 3,
+ sources: ['a.js'],
+ names: ['should-not-be-used'],
+ mappings: 'AAAA',
+ });
+
+ assert.deepStrictEqual(sm.findEntry(0, 0), {
+ generatedLine: 0,
+ generatedColumn: 0,
+ originalSource: 'a.js',
+ originalLine: 0,
+ originalColumn: 0,
+ name: undefined,
+ });
+}