php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Fix memory leak in zip when encountering empty glob result
This commit is contained in:
Niels Dossche
2025-09-05 18:57:26 +02:00
parent 924eea45a8 216e87ad7e
commit 1b49d0eb58
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -50,6 +50,9 @@ PHP NEWS
. Remove incorrect call to zval_ptr_dtor() in user_wrapper_metadata().
(nielsdos)
- Zip:
. Fix memory leak in zip when encountering empty glob result. (nielsdos)
28 Aug 2025, PHP 8.4.12
- Core:

2
ext/zip/php_zip.c
View File

@@ -667,7 +667,6 @@ int php_zip_glob(char *pattern, int pattern_len, zend_long flags, zval *return_v
can be used for simple glob() calls without further error
checking.
*/
array_init(return_value);
return 0;
}
#endif
@@ -676,7 +675,6 @@ int php_zip_glob(char *pattern, int pattern_len, zend_long flags, zval *return_v
/* now catch the FreeBSD style of "no matches" */
if (!globbuf.gl_pathc || !globbuf.gl_pathv) {
array_init(return_value);
return 0;
}