Merge pull request #28 from ZECTBynmo/master

creationix · creationix · commit 62ca604c4b05 · 2015-10-08T11:45:41.000-05:00
Fix infinite loop for characters above 244
diff --git a/jsonparse.js b/jsonparse.js
@@ -131,7 +131,7 @@ proto.write = function (buffer) {
         this.bytes_in_sequence = this.bytes_remaining = 0;
         i = i + j - 1;
       } else if (this.bytes_remaining === 0 && n >= 128) { // else if no remainder bytes carried over, parse multi byte (>=128) chars one at a time
-        if (n <= 193) {
+        if (n <= 193 || n > 244) {
           return this.onError(new Error("Invalid UTF-8 character at position " + i + " in state " + Parser.toknam(this.tState)));
         }
         if ((n >= 194) && (n <= 223)) this.bytes_in_sequence = 2;

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ proto.write = function (buffer) {`
`131`	`131`	`this.bytes_in_sequence = this.bytes_remaining = 0;`
`132`	`132`	`i = i + j - 1;`
`133`	`133`	`} else if (this.bytes_remaining === 0 && n >= 128) { // else if no remainder bytes carried over, parse multi byte (>=128) chars one at a time`
`134`		`- if (n <= 193) {`
	`134`	`+ if (n <= 193 \|\| n > 244) {`
`135`	`135`	`return this.onError(new Error("Invalid UTF-8 character at position " + i + " in state " + Parser.toknam(this.tState)));`
`136`	`136`	`}`
`137`	`137`	`if ((n >= 194) && (n <= 223)) this.bytes_in_sequence = 2;`