Merge pull request #2081 from nowackipawel/patch-71

lonnieezell · web-flow · commit 5193780d70e0 · 2019-06-29T22:29:01.000-05:00
JSON format checking improved
diff --git a/system/Entity.php b/system/Entity.php
@@ -588,7 +588,7 @@ private function castAsJson($value, bool $asArray = false)
 		$tmp = ! is_null($value) ? ($asArray ? [] : new \stdClass) : null;
 		if (function_exists('json_decode'))
 		{
-			if ((is_string($value) && (strpos($value, '[') === 0 || strpos($value, '{') === 0 || (strpos($value, '"') === 0 && strrpos($value, '"') === 0 ))) || is_numeric($value))
+			if ((is_string($value) && strlen($value) > 1 && in_array($value{0}, ['[','{','"'])) || is_numeric($value))
 			{
 				$tmp = json_decode($value, $asArray);
 

Original file line number	Diff line number	Diff line change
`@@ -588,7 +588,7 @@ private function castAsJson($value, bool $asArray = false)`
`588`	`588`	`$tmp = ! is_null($value) ? ($asArray ? [] : new \stdClass) : null;`
`589`	`589`	`if (function_exists('json_decode'))`
`590`	`590`	`{`
`591`		`- if ((is_string($value) && (strpos($value, '[') === 0 \|\| strpos($value, '{') === 0 \|\| (strpos($value, '"') === 0 && strrpos($value, '"') === 0 ))) \|\| is_numeric($value))`
	`591`	`+ if ((is_string($value) && strlen($value) > 1 && in_array($value{0}, ['[','{','"'])) \|\| is_numeric($value))`
`592`	`592`	`{`
`593`	`593`	`$tmp = json_decode($value, $asArray);`
`594`	`594`