Skip to content

Handle null name in IndexedSourceMapConsumer._parseMappings #279

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

Merged
merged 1 commit into from
Sep 26, 2017
Merged

Handle null name in IndexedSourceMapConsumer._parseMappings #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions dist/source-map.debug.js
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions dist/source-map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2447,9 +2447,12 @@ return /******/ (function(modules) { // webpackBootstrap
this._sources.add(source);
source = this._sources.indexOf(source);

var name = section.consumer._names.at(mapping.name);
this._names.add(name);
name = this._names.indexOf(name);
var name = null;
if (mapping.name) {
name = section.consumer._names.at(mapping.name);
this._names.add(name);
name = this._names.indexOf(name);
}

// The mappings coming from the consumer for the section have
// generated positions relative to the start of the section, so we
Expand Down
2 changes: 1 addition & 1 deletion dist/source-map.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/source-map.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions dist/test/test_api.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions dist/test/test_dog_fooding.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions dist/test/test_source_map_consumer.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions dist/test/test_source_map_generator.js
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 22 additions & 4 deletions dist/test/test_source_node.js
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions lib/source-map-consumer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,9 +1074,12 @@ IndexedSourceMapConsumer.prototype._parseMappings =
this._sources.add(source);
source = this._sources.indexOf(source);

var name = section.consumer._names.at(mapping.name);
this._names.add(name);
name = this._names.indexOf(name);
var name = null;
if (mapping.name) {
name = section.consumer._names.at(mapping.name);
this._names.add(name);
name = this._names.indexOf(name);
}

// The mappings coming from the consumer for the section have
// generated positions relative to the start of the section, so we
Expand Down
15 changes: 15 additions & 0 deletions test/test-source-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,3 +606,18 @@ exports['test walkSourceContents'] = function (assert) {
assert.equal(results[1][0], 'b.js');
assert.equal(results[1][1], 'otherContent');
};

exports['test from issue 258'] = function (assert) {
var node = new SourceNode();

var reactCode =
";require(0);\n//# sourceMappingURL=/index.ios.map?platform=ios&dev=false&minify=true";

var reactMap =
"{\"version\":3,\"file\":\"/index.ios.bundle?platform=ios&dev=false&minify=true\",\"sections\":[{\"offset\":{\"line\":0,\"column\":0},\"map\":{\"version\":3,\"sources\":[\"require-0.js\"],\"names\":[],\"mappings\":\"AAAA;\",\"file\":\"require-0.js\",\"sourcesContent\":[\";require(0);\"]}}]}";

node.add(SourceNode.fromStringWithSourceMap(
reactCode,
new SourceMapConsumer(reactMap)
));
}