fix err on bad \u char

laktak · laktak · commit 25903eceb172 · 2016-08-18T23:44:03.000+02:00
diff --git a/src/HJSON/HJSONParser.php b/src/HJSON/HJSONParser.php
@@ -105,8 +105,9 @@ private function string()
                         for ($i = 0; $i < 4; $i++) {
                             $uffff .= $this->next();
                         }
-                        $uffff = json_decode('"\u' . $uffff . '"');
-                        $string .= $uffff;
+                        if (!ctype_xdigit($uffff))
+                            $this->error("Bad \\u char");
+                        $string .= mb_convert_encoding(pack('H*', $uffff), 'UTF-8', 'UTF-16BE');
                     }
                     else if (@$this->escapee[$this->ch]) {
                         $string .= $this->escapee[$this->ch];
diff --git a/tests/assets/failKey4_test.hjson b/tests/assets/failKey4_test.hjson
@@ -0,0 +1,4 @@
+{
+  # invalid name
+  : 0
+}
diff --git a/tests/assets/failMLStr1_test.hjson b/tests/assets/failMLStr1_test.hjson
@@ -0,0 +1,3 @@
+{
+  # invalid multiline string
+  ml: '''
diff --git a/tests/assets/failStr7_test.hjson b/tests/assets/failStr7_test.hjson
@@ -0,0 +1,4 @@
+{
+  # invalid \u char
+  char: "\uxxxx"
+}
diff --git a/tests/assets/testlist.txt b/tests/assets/testlist.txt
@@ -31,6 +31,8 @@ fail8_test.json
 failKey1_test.hjson
 failKey2_test.hjson
 failKey3_test.hjson
+failKey4_test.hjson
+failMLStr1_test.hjson
 failObj1_test.hjson
 failObj2_test.hjson
 failObj3_test.hjson
@@ -40,6 +42,7 @@ failStr3_test.hjson
 failStr4_test.hjson
 failStr5_test.hjson
 failStr6_test.hjson
+failStr7_test.hjson
 kan_test.hjson
 keys_test.hjson
 oa_test.hjson

Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,9 @@ private function string()`
`105`	`105`	`for ($i = 0; $i < 4; $i++) {`
`106`	`106`	`$uffff .= $this->next();`
`107`	`107`	`}`
`108`		`- $uffff = json_decode('"\u' . $uffff . '"');`
`109`		`- $string .= $uffff;`
	`108`	`+ if (!ctype_xdigit($uffff))`
	`109`	`+ $this->error("Bad \\u char");`
	`110`	`+ $string .= mb_convert_encoding(pack('H*', $uffff), 'UTF-8', 'UTF-16BE');`
`110`	`111`	`}`
`111`	`112`	`else if (@$this->escapee[$this->ch]) {`
`112`	`113`	`$string .= $this->escapee[$this->ch];`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  # invalid name
 +  : 0
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ # invalid multiline string`
	`3`	`+ ml: '''`