Merge branch 'PHP-8.3'

nielsdos · nielsdos · commit eaf27400e6f4 · 2024-03-14T21:13:14.000+01:00
* PHP-8.3:
  Fix potential memory leak in XPath evaluation results
diff --git a/ext/dom/xpath_callbacks.c b/ext/dom/xpath_callbacks.c
@@ -365,7 +365,9 @@ static zval *php_dom_xpath_callback_fetch_args(xmlXPathParserContextPtr ctxt, ui
 				}
 				break;
 			default:
-				ZVAL_STRING(param, (char *)xmlXPathCastToString(obj));
+				char *str = (char *)xmlXPathCastToString(obj);
+				ZVAL_STRING(param, str);
+				xmlFree(str);
 				break;
 		}
 		xmlXPathFreeObject(obj);

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,9 @@ static zval *php_dom_xpath_callback_fetch_args(xmlXPathParserContextPtr ctxt, ui`
`365`	`365`	`}`
`366`	`366`	`break;`
`367`	`367`	`default:`
`368`		`- ZVAL_STRING(param, (char *)xmlXPathCastToString(obj));`
	`368`	`+ char str = (char )xmlXPathCastToString(obj);`
	`369`	`+ ZVAL_STRING(param, str);`
	`370`	`+ xmlFree(str);`
`369`	`371`	`break;`
`370`	`372`	`}`
`371`	`373`	`xmlXPathFreeObject(obj);`