xml: Migrate _ns_separator to ZendMM

ndossche · ndossche · commit c9c904f8168a · 2025-10-11T23:49:30.000+02:00
diff --git a/ext/xml/compat.c b/ext/xml/compat.c
@@ -465,7 +465,7 @@ XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *m
 		/* Note: sax2 flag will be set due to the magic number in `initialized` in php_xml_compat_handlers */
 		ZEND_ASSERT(parser->parser->sax->initialized == XML_SAX2_MAGIC);
 		parser->use_namespace = 1;
-		parser->_ns_separator = xmlStrdup(sep);
+		parser->_ns_separator = BAD_CAST estrdup((const char *) sep);
 	} else {
 		/* Reset flag as XML_SAX2_MAGIC is needed for xmlCreatePushParserCtxt
 		so must be set in the handlers */
@@ -718,7 +718,7 @@ XML_ParserFree(XML_Parser parser)
 {
 	if (parser->use_namespace) {
 		if (parser->_ns_separator) {
-			xmlFree(parser->_ns_separator);
+			efree(parser->_ns_separator);
 		}
 	}
 	if (parser->parser->myDoc) {

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ XML_ParserCreate_MM(const XML_Char encoding, const XML_Memory_Handling_Suite m`
`465`	`465`	/* Note: sax2 flag will be set due to the magic number in `initialized` in php_xml_compat_handlers */
`466`	`466`	`ZEND_ASSERT(parser->parser->sax->initialized == XML_SAX2_MAGIC);`
`467`	`467`	`parser->use_namespace = 1;`
`468`		`- parser->_ns_separator = xmlStrdup(sep);`
	`468`	`+ parser->_ns_separator = BAD_CAST estrdup((const char *) sep);`
`469`	`469`	`} else {`
`470`	`470`	`/* Reset flag as XML_SAX2_MAGIC is needed for xmlCreatePushParserCtxt`
`471`	`471`	`so must be set in the handlers */`
`@@ -718,7 +718,7 @@ XML_ParserFree(XML_Parser parser)`
`718`	`718`	`{`
`719`	`719`	`if (parser->use_namespace) {`
`720`	`720`	`if (parser->_ns_separator) {`
`721`		`- xmlFree(parser->_ns_separator);`
	`721`	`+ efree(parser->_ns_separator);`
`722`	`722`	`}`
`723`	`723`	`}`
`724`	`724`	`if (parser->parser->myDoc) {`