More error messages and improved

Author: Girgias

Zend/tests/zend_ini/zend_ini_parse_quantity_error.phpt

@@ -17,6 +17,11 @@ $tests = [
     '0Z',    # Invalid prefix
     '0XK',   # Valid prefix with no value and multiplier
 
+    '++',
+    '-+',
+    '+ 25',
+    '- 25',
+
     # Null bytes
     " 123\x00K",
     "\x00 123K",
@@ -54,7 +59,7 @@ int(1024)
 
 # "0X"
 
-Warning: Invalid quantity: no digits after base prefix, interpreting as "0" for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
+Warning: Invalid quantity "0X": no digits after base prefix, interpreting as "0" for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
 int(0)
 
 # "0Z"
@@ -67,6 +72,26 @@ int(0)
 Warning: Invalid quantity "0XK": no valid leading digits, interpreting as "0" for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
 int(0)
 
+# "++"
+
+Warning: Invalid quantity "++": no valid leading digits, interpreting as "0" for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
+int(0)
+
+# "-+"
+
+Warning: Invalid quantity "-+": no valid leading digits, interpreting as "0" for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
+int(0)
+
+# "+ 25"
+
+Warning: Invalid quantity "+ 25": no valid leading digits, interpreting as "0" for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
+int(0)
+
+# "- 25"
+
+Warning: Invalid quantity "- 25": no valid leading digits, interpreting as "0" for backwards compatibility in %s%ezend_ini_parse_quantity_error.php on line %d
+int(0)
+
 # " 123\000K"
 
 Warning: Invalid quantity " 123\x00K", interpreting as " 123K" for backwards compatibility in %s on line %d

Zend/zend_ini.c

@@ -579,11 +579,19 @@ static zend_ulong zend_ini_parse_quantity_internal(zend_string *value, zend_ini_
 		++digits;
 	}
 
-	/* TODO Handle cases such as ++25, --25, or white space after sign symbol?
+	/* if there is no digit after +/- */
 	if (!isdigit(digits[0])) {
+		/* Escape the string to avoid null bytes and to make non-printable chars
+		 * visible */
+		smart_str_append_escaped(&invalid, ZSTR_VAL(value), ZSTR_LEN(value));
+		smart_str_0(&invalid);
+
+		*errstr = zend_strpprintf(0, "Invalid quantity \"%s\": no valid leading digits, interpreting as \"0\" for backwards compatibility",
+						ZSTR_VAL(invalid.s));
 
+		smart_str_free(&invalid);
+		return 0;
 	}
-	*/
 
 	int base = 0;
 	if (digits[0] == '0' && !isdigit(digits[1])) {
@@ -621,7 +629,15 @@ static zend_ulong zend_ini_parse_quantity_internal(zend_string *value, zend_ini_
         }
         digits += 2;
 		if (UNEXPECTED(digits == str_end)) {
-			*errstr = zend_strpprintf(0, "Invalid quantity: no digits after base prefix, interpreting as \"0\" for backwards compatibility");
+			/* Escape the string to avoid null bytes and to make non-printable chars
+			 * visible */
+			smart_str_append_escaped(&invalid, ZSTR_VAL(value), ZSTR_LEN(value));
+			smart_str_0(&invalid);
+
+			*errstr = zend_strpprintf(0, "Invalid quantity \"%s\": no digits after base prefix, interpreting as \"0\" for backwards compatibility",
+							ZSTR_VAL(invalid.s));
+
+			smart_str_free(&invalid);
 			return 0;
 		}
 	}