Merge 055ec0e into 66d4c5d

zendframework · Jul 8, 2018 · b3e4a33 · b3e4a33
2 parents 66d4c5d + 055ec0e
commit b3e4a33
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Decoder.php b/src/Decoder.php
@@ -444,21 +444,21 @@ protected function getNextToken()
                 $this->tokenValue = $result;
                 break;
             case 't':
-                if (($i + 3) < $strLength && substr($str, $start, 4) === "true") {
+                if (($i + 3) < $strLength && $start === strpos($str, "true", $start)) {
                     $this->token = self::DATUM;
                 }
                 $this->tokenValue = true;
                 $i += 3;
                 break;
             case 'f':
-                if (($i + 4) < $strLength && substr($str, $start, 5) === "false") {
+                if (($i + 4) < $strLength && $start === strpos($str, "false", $start)) {
                     $this->token = self::DATUM;
                 }
                 $this->tokenValue = false;
                 $i += 4;
                 break;
             case 'n':
-                if (($i + 3) < $strLength && substr($str, $start, 4) === "null") {
+                if (($i + 3) < $strLength && $start === strpos($str, "null", $start)) {
                     $this->token = self::DATUM;
                 }
                 $this->tokenValue = null;