Fix parsing for multibyte strings

dqsully · dqsully · commit 2257b0da79a8 · 2019-02-09T23:26:47.000-07:00
diff --git a/src/HJSON/HJSONParser.php b/src/HJSON/HJSONParser.php
@@ -326,8 +326,8 @@ private function next($c = false)
 
         // Get the next character. When there are no more characters,
         // return the empty string.
-        $this->ch = (mb_strlen($this->text) > $this->at) ? $this->text[$this->at] : null;
-        $this->at++;
+        $this->ch = (strlen($this->text) > $this->at) ? mb_substr(mb_strcut($this->text, $this->at), 0, 1) : null;
+        $this->at = $this->at + strlen($this->ch);
         return $this->ch;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -326,8 +326,8 @@ private function next($c = false)`
`326`	`326`
`327`	`327`	`// Get the next character. When there are no more characters,`
`328`	`328`	`// return the empty string.`
`329`		`- $this->ch = (mb_strlen($this->text) > $this->at) ? $this->text[$this->at] : null;`
`330`		`- $this->at++;`
	`329`	`+ $this->ch = (strlen($this->text) > $this->at) ? mb_substr(mb_strcut($this->text, $this->at), 0, 1) : null;`
	`330`	`+ $this->at = $this->at + strlen($this->ch);`
`331`	`331`	`return $this->ch;`
`332`	`332`	`}`
`333`	`333`