[php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6
| From: | Weilin Du | Date: | Wed, 11 Nov 2026 11:59:33 +0000 |
| Subject: | [php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-143580@lists.php.net to get a copy of this message | ||
Author: Weilin Du (LamentXU123)
Date: 2026-11-11T19:57:45+08:00
Commit: https://github.com/php/php-src/commit/ce04b3fd98097a0bcb7ccac865097173c604eff2
Raw diff: https://github.com/php/php-src/commit/ce04b3fd98097a0bcb7ccac865097173c604eff2.diff
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
Fix error buffer cleanup in phar_open_parsed_phar() (#25376)
Changed paths:
M ext/phar/phar.c
Diff:
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index bee5fe796ebd..bc961e10a200 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -555,7 +555,8 @@ static zend_result phar_open_parsed_phar(
}
if (phar && error && !(options & REPORT_ERRORS)) {
- efree(error);
+ efree(*error);
+ *error = NULL;
}
return FAILURE;