[php-src] PHP-8.6: Merge branch 'PHP-8.4' into PHP-8.5
| From: | Weilin Du | Date: | Wed, 11 Nov 2026 11:59:30 +0000 |
| Subject: | [php-src] PHP-8.6: Merge branch 'PHP-8.4' into PHP-8.5 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-143579@lists.php.net to get a copy of this message | ||
Author: Weilin Du (LamentXU123)
Date: 2026-11-11T19:56:47+08:00
Commit: https://github.com/php/php-src/commit/81f9483224377879eb370b21a2fe9706eceb5014
Raw diff: https://github.com/php/php-src/commit/81f9483224377879eb370b21a2fe9706eceb5014.diff
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
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 14791144c386..9aa3f8d73bf1 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -558,7 +558,8 @@ static zend_result phar_open_parsed_phar(char *fname, size_t fname_len, char *al
}
if (phar && error && !(options & REPORT_ERRORS)) {
- efree(error);
+ efree(*error);
+ *error = NULL;
}
return FAILURE;