Fix phpGH-16886: ini_parse_quantity() fails to emit warning for 0x+0

Author: nielsdos

Zend/tests/zend_ini/gh16886.phpt

@@ -0,0 +1,41 @@
+--TEST--
+GH-16886 (ini_parse_quantity() fails to emit warning for 0x+0)
+--FILE--
+<?php
+echo ini_parse_quantity('0x 0'), "\n";
+echo ini_parse_quantity('0x+0'), "\n";
+echo ini_parse_quantity('0x-0'), "\n";
+echo ini_parse_quantity('0b 0'), "\n";
+echo ini_parse_quantity('0b+0'), "\n";
+echo ini_parse_quantity('0b-0'), "\n";
+echo ini_parse_quantity('0o 0'), "\n";
+echo ini_parse_quantity('0o+0'), "\n";
+echo ini_parse_quantity('0o-0'), "\n";
+?>
+--EXPECTF--
+Warning: Invalid quantity "0x 0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0
+
+Warning: Invalid quantity "0x+0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0
+
+Warning: Invalid quantity "0x-0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0
+
+Warning: Invalid quantity "0b 0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0
+
+Warning: Invalid quantity "0b+0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0
+
+Warning: Invalid quantity "0b-0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0
+
+Warning: Invalid quantity "0o 0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0
+
+Warning: Invalid quantity "0o+0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0
+
+Warning: Invalid quantity "0o-0": no digits after base prefix, interpreting as "0" for backwards compatibility in %s on line %d
+0

Zend/zend_ini.c

@@ -598,7 +598,7 @@ static const char *zend_ini_consume_quantity_prefix(const char *const digits, co
 	if (digits_consumed[0] == '0' && !isdigit(digits_consumed[1])) {
 		/* Value is just 0 */
 		if ((digits_consumed+1) == str_end) {
-			return digits;
+			return digits_consumed;
 		}
 
 		switch (digits_consumed[1]) {