JSON format checking improved

nowackipawel · web-flow · commit 987b705e8aff · 2019-06-29T10:56:39.000+02:00
#2080 (...) And I thought the correct code was (strpos($value, '"') === 0 && strrpos($value, '"') === strlen($value) - 1 ) (...)
diff --git a/system/Entity.php b/system/Entity.php
@@ -588,7 +588,8 @@ 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))
+			$strlen = is_strimg($value) ? strlen($value) : 0;
+			if (($strlen > 1 && is_string($value) && ((strpos($value, '[') === 0 && strrpos($value, ']') === $strlen - 1) || (strpos($value, '{') === 0 && strrpos($value, '}') === $strlen - 1) || (strpos($value, '"') === 0 && strrpos($value, '"') === $strlen - 1))) || is_numeric($value))
 			{
 				$tmp = json_decode($value, $asArray);
 

Original file line number	Diff line number	Diff line change
`@@ -588,7 +588,8 @@ 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`	`+ $strlen = is_strimg($value) ? strlen($value) : 0;`
	`592`	`+ if (($strlen > 1 && is_string($value) && ((strpos($value, '[') === 0 && strrpos($value, ']') === $strlen - 1) \|\| (strpos($value, '{') === 0 && strrpos($value, '}') === $strlen - 1) \|\| (strpos($value, '"') === 0 && strrpos($value, '"') === $strlen - 1))) \|\| is_numeric($value))`
`592`	`593`	`{`
`593`	`594`	`$tmp = json_decode($value, $asArray);`
`594`	`595`