[php-src] master: Merge branch 'PHP-8.3'
| From: | Niels Dossche | Date: | Thu, 14 Mar 2024 20:27:26 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.3' | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-127738@lists.php.net to get a copy of this message | ||
Author: Niels Dossche (nielsdos)
Date: 2024-03-14T21:13:14+01:00
Commit: https://github.com/php/php-src/commit/eaf27400e6f412ed99a48407d19f838512d539c8
Raw diff: https://github.com/php/php-src/commit/eaf27400e6f412ed99a48407d19f838512d539c8.diff
Merge branch 'PHP-8.3'
* PHP-8.3:
Fix potential memory leak in XPath evaluation results
Changed paths:
M ext/dom/xpath_callbacks.c
Diff:
diff --git a/ext/dom/xpath_callbacks.c b/ext/dom/xpath_callbacks.c
index 8eb037d26f98..2c213050d02f 100644
--- 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);