Merge branch 'PHP-8.4' into PHP-8.5

ndossche · ndossche · commit 0f47d0de5e21 · 2025-09-30T18:07:16.000+02:00
* PHP-8.4: Fix GH-20009: XMLReader leak on RelaxNG schema failure
diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
@@ -557,6 +557,7 @@ static void php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAMETERS, int t
 
 			RETURN_TRUE;
 		} else {
+			xmlRelaxNGFree(schema);
 			php_error_docref(NULL, E_WARNING, "Schema contains errors");
 			RETURN_FALSE;
 		}

Original file line number	Diff line number	Diff line change
`@@ -557,6 +557,7 @@ static void php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAMETERS, int t`
`557`	`557`
`558`	`558`	`RETURN_TRUE;`
`559`	`559`	`} else {`
	`560`	`+ xmlRelaxNGFree(schema);`
`560`	`561`	`php_error_docref(NULL, E_WARNING, "Schema contains errors");`
`561`	`562`	`RETURN_FALSE;`
`562`	`563`	`}`