blob: 74b81754afffd2336e665db1e17925c8b6381489 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
Upstream: https://github.com/php/php-src/pull/5311
--- php-7.4.4/ext/zip/php_zip.c 2020-03-17 10:40:30.000000000 +0000
+++ php-7.4.4/ext/zip/php_zip.c 2020-03-27 15:28:13.259857804 -0500
@@ -606,8 +606,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;
|
