ext/XML: Improve invalid value handling for XML_OPTION_SKIP_TAGSTART

Author: LamentXU123

ext/xml/tests/xml_parser_set_option_errors.phpt

@@ -40,6 +40,8 @@ xml_parser_set_option($xmlParser, XML_OPTION_SKIP_TAGSTART, new stdClass());
 
 xml_parser_set_option($xmlParser, XML_OPTION_SKIP_TAGSTART, "not numeric");
 
+xml_parser_set_option($xmlParser, XML_OPTION_SKIP_TAGSTART, "123test");
+
 echo "Encodings\n";
 try {
     xml_parser_set_option($xmlParser, XML_OPTION_TARGET_ENCODING, 'Invalid Encoding');
@@ -77,7 +79,9 @@ Warning: xml_parser_set_option(): Argument #3 ($value) must be of type string|in
 
 Warning: xml_parser_set_option(): Argument #3 ($value) must be of type string|int|bool, stdClass given in %s on line %d
 
-Warning: xml_parser_set_option(): Argument #3 ($value) must be a valid integer for option XML_OPTION_SKIP_TAGSTART in %s on line %d
+Warning: xml_parser_set_option(): Argument #3 ($value) must be of type int for the XML_OPTION_SKIP_TAGSTART option, string given in %s on line %d
+
+Warning: xml_parser_set_option(): Argument #3 ($value) must be of type int for the XML_OPTION_SKIP_TAGSTART option, string given in %s on line %d
 Encodings
 xml_parser_set_option(): Argument #3 ($value) is not a supported target encoding
 

ext/xml/xml.c

@@ -1588,15 +1588,25 @@ PHP_FUNCTION(xml_parser_set_option)
 		/* Integer option */
 		case PHP_XML_OPTION_SKIP_TAGSTART: {
 			/* The tag start offset is stored in an int */
-			bool failed = false;
-			zend_long value_long = zval_try_get_long(value, &failed);
-			if (failed) {
-				if (Z_TYPE_P(value) == IS_STRING) {
+			zend_long value_long;
+
+			if (Z_TYPE_P(value) == IS_LONG) {
+				value_long = Z_LVAL_P(value);
+			} else if (Z_TYPE_P(value) == IS_FALSE) {
+				value_long = 0;
+			} else if (Z_TYPE_P(value) == IS_TRUE) {
+				value_long = 1;
+			} else if (Z_TYPE_P(value) == IS_STRING) {
+				int oflow = 0;
+				if (is_numeric_string_ex(Z_STRVAL_P(value), Z_STRLEN_P(value), &value_long, NULL, false, &oflow, NULL) != IS_LONG || oflow) {
 					php_error_docref(NULL, E_WARNING,
-						"Argument #3 ($value) must be a valid integer for option XML_OPTION_SKIP_TAGSTART");
+						"Argument #3 ($value) must be of type int for the XML_OPTION_SKIP_TAGSTART option, string given");
+					RETURN_FALSE;
 				}
+			} else {
 				RETURN_FALSE;
 			}
+
 			if (value_long < 0 || value_long > INT_MAX) {
 				/* TODO Promote to ValueError in PHP 9.0 */
 				php_error_docref(NULL, E_WARNING, "Argument #3 ($value) must be between 0 and %d"