Patch json_decode_positive_sign.patch for JSON related Bug #80678

Patch version 2021-01-28 10:42 UTC

• 2021-01-28 10:42 UTC [diff to current]

Developer: phpbugs@canavan.de

diff --git a/ext/json/json_scanner.re b/ext/json/json_scanner.re
index c8e3e0ebf5..6f48cf522e 100644
--- a/ext/json/json_scanner.re
+++ b/ext/json/json_scanner.re
@@ -113,7 +113,7 @@ std:
 	DIGIT   = [0-9] ;
 	DIGITNZ = [1-9] ;
 	UINT    = "0" | ( DIGITNZ DIGIT* ) ;
-	INT     = "-"? UINT ;
+	INT     = ( "+" | "-" ) ? UINT ;
 	HEX     = DIGIT | [a-fA-F] ;
 	HEXNZ   = DIGITNZ | [a-fA-F] ;
 	HEX7    = [0-7] ;
diff --git a/ext/json/tests/bug80678.phpt b/ext/json/tests/bug80678.phpt
new file mode 100644
index 0000000000..283540e921
--- /dev/null
+++ b/ext/json/tests/bug80678.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Bug #80678 (json_decode() fails on numbers with explicit "+" sign)
+--FILE--
+<?php
+
+var_dump(json_decode('+123.456'));
+
+echo "Done\n";
+?>
+--EXPECT--
+123.456
+Done