ext/XML: Improve invalid value handling for XML_OPTION_SKIP_TAGSTART

LamentXU123 · LamentXU123 · commit bae1fe44e55f · 2026-05-15T08:13:52.000+08:00
diff --git a/ext/xml/tests/xml_parser_set_option_errors.phpt b/ext/xml/tests/xml_parser_set_option_errors.phpt
@@ -38,7 +38,11 @@ xml_parser_set_option($xmlParser, XML_OPTION_SKIP_TAGSTART, []);
 
 xml_parser_set_option($xmlParser, XML_OPTION_SKIP_TAGSTART, new stdClass());
 
-xml_parser_set_option($xmlParser, XML_OPTION_SKIP_TAGSTART, "not numeric");
+var_dump(xml_parser_set_option($xmlParser, XML_OPTION_SKIP_TAGSTART, "123test"));
+var_dump(xml_parser_get_option($xmlParser, XML_OPTION_SKIP_TAGSTART));
+
+var_dump(xml_parser_set_option($xmlParser, XML_OPTION_SKIP_TAGSTART, 1.5));
+var_dump(xml_parser_get_option($xmlParser, XML_OPTION_SKIP_TAGSTART));
 
 echo "Encodings\n";
 try {
@@ -77,7 +81,13 @@ 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: A non-numeric value encountered in %s on line %d
+bool(true)
+int(123)
+
+Warning: xml_parser_set_option(): Argument #3 ($value) must be of type string|int|bool, float given in %s on line %d
+bool(true)
+int(1)
 Encodings
 xml_parser_set_option(): Argument #3 ($value) is not a supported target encoding
 
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
@@ -1588,15 +1588,11 @@ 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) {
-					php_error_docref(NULL, E_WARNING,
-						"Argument #3 ($value) must be a valid integer for option XML_OPTION_SKIP_TAGSTART");
-				}
+			if (Z_TYPE_P(value) == IS_ARRAY || Z_TYPE_P(value) == IS_OBJECT || Z_TYPE_P(value) == IS_RESOURCE) {
 				RETURN_FALSE;
 			}
+
+			zend_long value_long = zval_get_long(value);
 			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"
