Move common encoding validity checking function to ext-libxml

Author: nielsdos

ext/libxml/libxml.c

@@ -1075,6 +1075,22 @@ PHP_LIBXML_API bool php_libxml_uses_internal_errors(void)
 	return xmlStructuredError == php_libxml_structured_error_handler;
 }
 
+PHP_LIBXML_API bool php_libxml_is_valid_encoding(const char *encoding)
+{
+	if (!encoding) {
+		return true;
+	}
+
+	/* Normally we could use xmlTextReaderConstEncoding() afterwards but libxml2 < 2.12.0 has a bug of course
+	 * where it returns NULL for some valid encodings instead. */
+	xmlCharEncodingHandlerPtr handler = xmlFindCharEncodingHandler(encoding);
+	if (!handler) {
+		return false;
+	}
+	xmlCharEncCloseFunc(handler);
+	return true;
+}
+
 /* {{{ Disable libxml errors and allow user to fetch error information as needed */
 PHP_FUNCTION(libxml_use_internal_errors)
 {

ext/libxml/php_libxml.h

@@ -214,6 +214,7 @@ PHP_LIBXML_API bool php_libxml_disable_entity_loader(bool disable);
 PHP_LIBXML_API void php_libxml_set_old_ns(xmlDocPtr doc, xmlNsPtr ns);
 PHP_LIBXML_API php_stream_context *php_libxml_get_stream_context(void);
 PHP_LIBXML_API bool php_libxml_uses_internal_errors(void);
+PHP_LIBXML_API bool php_libxml_is_valid_encoding(const char *encoding);
 
 PHP_LIBXML_API xmlChar *php_libxml_attr_value(const xmlAttr *attr, bool *free);
 

ext/xmlreader/php_xmlreader.c

@@ -881,22 +881,6 @@ PHP_METHOD(XMLReader, next)
 }
 /* }}} */
 
-static bool xmlreader_valid_encoding(const char *encoding)
-{
-	if (!encoding) {
-		return true;
-	}
-
-	/* Normally we could use xmlTextReaderConstEncoding() afterwards but libxml2 < 2.12.0 has a bug of course
-	 * where it returns NULL for some valid encodings instead. */
-	xmlCharEncodingHandlerPtr handler = xmlFindCharEncodingHandler(encoding);
-	if (!handler) {
-		return false;
-	}
-	xmlCharEncCloseFunc(handler);
-	return true;
-}
-
 /* {{{ Sets the URI that the XMLReader will parse. */
 static void xml_reader_from_uri(INTERNAL_FUNCTION_PARAMETERS, zend_class_entry *instance_ce, bool use_exceptions)
 {
@@ -925,7 +909,7 @@ static void xml_reader_from_uri(INTERNAL_FUNCTION_PARAMETERS, zend_class_entry *
 		RETURN_THROWS();
 	}
 
-	if (!xmlreader_valid_encoding(encoding)) {
+	if (!php_libxml_is_valid_encoding(encoding)) {
 		zend_argument_value_error(2, "must be a valid character encoding");
 		RETURN_THROWS();
 	}
@@ -1013,7 +997,7 @@ PHP_METHOD(XMLReader, fromStream)
 
 	php_stream_from_res(stream, Z_RES_P(stream_zv));
 
-	if (!xmlreader_valid_encoding(encoding_name)) {
+	if (!php_libxml_is_valid_encoding(encoding_name)) {
 		zend_argument_value_error(2, "must be a valid character encoding");
 		RETURN_THROWS();
 	}
@@ -1197,7 +1181,7 @@ static void xml_reader_from_string(INTERNAL_FUNCTION_PARAMETERS, zend_class_entr
 		RETURN_THROWS();
 	}
 
-	if (!xmlreader_valid_encoding(encoding)) {
+	if (!php_libxml_is_valid_encoding(encoding)) {
 		zend_argument_value_error(2, "must be a valid character encoding");
 		RETURN_THROWS();
 	}