diff options
| author | Remi Collet <remi@php.net> | 2020-03-29 14:23:03 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2020-03-29 14:23:03 +0200 |
| commit | 2292ef93d5d8ff67cd5afc55495f2936a4a37596 (patch) | |
| tree | c484eec9188f23be621b944fb628b9fc6174b928 | |
| parent | cc0c5b9343278c6bd54da0d3fe1eafc25b3ddc29 (diff) | |
| parent | 04920645f14ea117d5248ef3a0e03c6784c2fb49 (diff) | |
| download | php-git-2292ef93d5d8ff67cd5afc55495f2936a4a37596.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79424 ext/zip: don't use gl_pathc after call to globfree
| -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 5dd6d8f29e..883b6f6d40 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -602,8 +602,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; |