Fix xdiff_string_patch#1

bperel · bperel · commit 7db35be106d6 · 2014-01-16T20:12:19.000+01:00
diff --git a/functions/xdiff/xdiff_string_patch.js b/functions/xdiff/xdiff_string_patch.js
@@ -135,7 +135,7 @@ function xdiff_string_patch(originalStr, patch, flags, error) {
         }
       }
     }
-	while (linePos < origLines.length) {
+	while (linePos > 0 && linePos < origLines.length) {
 	  newStrArr[newStrArr.length] = origLines[linePos++];
 	}
   } else if (flags & OPTS.XDIFF_PATCH_REVERSE) { // Only differs from above by a few lines
@@ -168,7 +168,7 @@ function xdiff_string_patch(originalStr, patch, flags, error) {
         }
       }
     }
-	while (linePos < origLines.length) {
+	while (linePos > 0 && linePos < origLines.length) {
 	  newStrArr[newStrArr.length] = origLines[linePos++];
 	}
   }

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ function xdiff_string_patch(originalStr, patch, flags, error) {`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`}`
`138`		`- while (linePos < origLines.length) {`
	`138`	`+ while (linePos > 0 && linePos < origLines.length) {`
`139`	`139`	`newStrArr[newStrArr.length] = origLines[linePos++];`
`140`	`140`	`}`
`141`	`141`	`} else if (flags & OPTS.XDIFF_PATCH_REVERSE) { // Only differs from above by a few lines`
`@@ -168,7 +168,7 @@ function xdiff_string_patch(originalStr, patch, flags, error) {`
`168`	`168`	`}`
`169`	`169`	`}`
`170`	`170`	`}`
`171`		`- while (linePos < origLines.length) {`
	`171`	`+ while (linePos > 0 && linePos < origLines.length) {`
`172`	`172`	`newStrArr[newStrArr.length] = origLines[linePos++];`
`173`	`173`	`}`
`174`	`174`	`}`