Merge branch 'PHP-8.3' into PHP-8.4

ndossche · ndossche · commit 58b45b505589 · 2025-09-30T18:07:08.000+02:00
* PHP-8.3: Fix GH-20009: XMLReader leak on RelaxNG schema failure
diff --git a/NEWS b/NEWS
@@ -53,6 +53,9 @@ PHP                                                                        NEWS
   . Fixed bug GH-19801 (leaks in var_dump() and debug_zval_dump()).
     (alexandre-daubois)
 
+- XMLReader:
+  . Fixed bug GH-20009 (XMLReader leak on RelaxNG schema failure). (nielsdos)
+
 - Zip:
   . Fixed bug GH-19688 (Remove pattern overflow in zip addGlob()). (nielsdos)
   . Fixed bug GH-19932 (Memory leak in zip setEncryptionName()/setEncryptionIndex()).
diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
@@ -542,6 +542,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
`@@ -542,6 +542,7 @@ static void php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAMETERS, int t`
`542`	`542`
`543`	`543`	`RETURN_TRUE;`
`544`	`544`	`} else {`
	`545`	`+ xmlRelaxNGFree(schema);`
`545`	`546`	`php_error_docref(NULL, E_WARNING, "Schema contains errors");`
`546`	`547`	`RETURN_FALSE;`
`547`	`548`	`}`