summaryrefslogtreecommitdiff
path: root/user/php7/zip-glob-pathc.patch
diff options
context:
space:
mode:
Diffstat (limited to 'user/php7/zip-glob-pathc.patch')
-rw-r--r--user/php7/zip-glob-pathc.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/user/php7/zip-glob-pathc.patch b/user/php7/zip-glob-pathc.patch
new file mode 100644
index 000000000..74b81754a
--- /dev/null
+++ b/user/php7/zip-glob-pathc.patch
@@ -0,0 +1,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;