diff options
| author | Remi Collet <remi@php.net> | 2020-03-29 14:24:12 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2020-03-29 14:24:12 +0200 |
| commit | 5fa17fbf94fa95705922313ac0d19e38ddabbad9 (patch) | |
| tree | fbf32448f30920933d5359bb063a938cefada352 /ext/zip/php_zip.c | |
| parent | 099ffc21698b32f86416c39118b95926f2f0a865 (diff) | |
| parent | d66a063e0f3ac5a7d9e842c2c6ff43bb58307757 (diff) | |
| download | php-git-5fa17fbf94fa95705922313ac0d19e38ddabbad9.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
NEWS
Fix #79424 ext/zip: don't use gl_pathc after call to globfree
Diffstat (limited to 'ext/zip/php_zip.c')
| -rw-r--r-- | ext/zip/php_zip.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 2a3537a8ca..040e9d4f1b 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -688,8 +688,9 @@ int php_zip_glob(char *pattern, int pattern_len, zend_long flags, zval *return_v add_next_index_string(return_value, globbuf.gl_pathv[n]+cwd_skip); } + ret = globbuf.gl_pathc; globfree(&globbuf); - return globbuf.gl_pathc; + return ret; #else zend_throw_error(NULL, "Glob support is not available"); return 0; |