From 04920645f14ea117d5248ef3a0e03c6784c2fb49 Mon Sep 17 00:00:00 2001 From: Max Rees Date: Fri, 27 Mar 2020 12:57:24 -0500 Subject: Fix #79424 ext/zip: don't use gl_pathc after call to globfree This breaks on Linux with the musl libc, since it zeroes out gl_pathc during globfree. --- ext/zip/php_zip.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ext/zip/php_zip.c') diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 48af712b9c..9cbef05285 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -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; -- cgit v1.2.1