Avoid undefined line in fromStringWithSourceMap

Avoid calling substr on `undefined` in `fromStringWithSourceMap`. This can happen when passing in a source map that refers to lines past the end of the passed-in string -- caller error, but let's not die. Fixes mozilla#247
tromey · Sep 27, 2017 · 1378f15 · 1378f15
1 parent 75131c7
commit 1378f15
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/dist/source-map.debug.js b/dist/source-map.debug.js
diff --git a/dist/source-map.js b/dist/source-map.js
@@ -2895,7 +2895,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	          // There is no new line in between.
 	          // Associate the code between "lastGeneratedColumn" and
 	          // "mapping.generatedColumn" with "lastMapping"
-	          var nextLine = remainingLines[remainingLinesIndex];
+	          var nextLine = remainingLines[remainingLinesIndex] || '';
 	          var code = nextLine.substr(0, mapping.generatedColumn -
 	                                        lastGeneratedColumn);
 	          remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn -
@@ -2915,7 +2915,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        lastGeneratedLine++;
 	      }
 	      if (lastGeneratedColumn < mapping.generatedColumn) {
-	        var nextLine = remainingLines[remainingLinesIndex];
+	        var nextLine = remainingLines[remainingLinesIndex] || '';
 	        node.add(nextLine.substr(0, mapping.generatedColumn));
 	        remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn);
 	        lastGeneratedColumn = mapping.generatedColumn;

diff --git a/dist/source-map.min.js b/dist/source-map.min.js
diff --git a/dist/source-map.min.js.map b/dist/source-map.min.js.map
diff --git a/dist/test/test_api.js b/dist/test/test_api.js
diff --git a/dist/test/test_source_map_generator.js b/dist/test/test_source_map_generator.js
diff --git a/dist/test/test_source_node.js b/dist/test/test_source_node.js
diff --git a/lib/source-node.js b/lib/source-node.js
@@ -97,7 +97,7 @@ SourceNode.fromStringWithSourceMap =
           // There is no new line in between.
           // Associate the code between "lastGeneratedColumn" and
           // "mapping.generatedColumn" with "lastMapping"
-          var nextLine = remainingLines[remainingLinesIndex];
+          var nextLine = remainingLines[remainingLinesIndex] || '';
           var code = nextLine.substr(0, mapping.generatedColumn -
                                         lastGeneratedColumn);
           remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn -
@@ -117,7 +117,7 @@ SourceNode.fromStringWithSourceMap =
         lastGeneratedLine++;
       }
       if (lastGeneratedColumn < mapping.generatedColumn) {
-        var nextLine = remainingLines[remainingLinesIndex];
+        var nextLine = remainingLines[remainingLinesIndex] || '';
         node.add(nextLine.substr(0, mapping.generatedColumn));
         remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn);
         lastGeneratedColumn = mapping.generatedColumn;