[php-src] PHP-8.3: Merge branch 'PHP-8.2' into PHP-8.3

Author: Niels Dossche (nielsdos) Date: 2024-03-14T21:11:19+01:00 Commit: https://github.com/php/php-src/commit/0f79c2262700920d43df8e1d74122c72fa3387dd Raw diff: https://github.com/php/php-src/commit/0f79c2262700920d43df8e1d74122c72fa3387dd.diff Merge branch 'PHP-8.2' into PHP-8.3 * PHP-8.2: Fix potential memory leak in XPath evaluation results Changed paths: M NEWS M ext/dom/xpath.c Diff: diff --git a/NEWS b/NEWS index 182c51160c9c6..77ba90394580d 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,7 @@ PHP NEWS - DOM: . Add some missing ZPP checks. (nielsdos) + . Fix potential memory leak in XPath evaluation results. (nielsdos) - FPM: . Fixed GH-11086 (FPM: config test runs twice in daemonised mode). diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c index 73ceb49362781..22a7e0ecc5a91 100644 --- a/ext/dom/xpath.c +++ b/ext/dom/xpath.c @@ -125,8 +125,11 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, } } break; - default: - ZVAL_STRING(&fci.params[i], (char *)xmlXPathCastToString(obj)); + default: { + str = (char *)xmlXPathCastToString(obj); + ZVAL_STRING(&fci.params[i], str); + xmlFree(str); + } } xmlXPathFreeObject(obj); }