Skip to content

Commit 2292ef9

Browse files
committed
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
2 parents cc0c5b9 + 0492064 commit 2292ef9

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

ext/zip/php_zip.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,8 +602,9 @@ int php_zip_glob(char *pattern, int pattern_len, zend_long flags, zval *return_v
602602
add_next_index_string(return_value, globbuf.gl_pathv[n]+cwd_skip);
603603
}
604604

605+
ret = globbuf.gl_pathc;
605606
globfree(&globbuf);
606-
return globbuf.gl_pathc;
607+
return ret;
607608
#else
608609
zend_throw_error(NULL, "Glob support is not available");
609610
return 0;

0 commit comments

Comments
 (0)