diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-09-06 01:07:15 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-09-06 01:15:36 +0200 |
| commit | 81ec843d0ee6a7e236cfab15f1908953d7247677 (patch) | |
| tree | 91e2b688d203e8693ef174404b8ce22fdc4ed675 /ext/zip/php_zip.c | |
| parent | 009ee6e503fd2f354f6eda2b6a74f13344dca3b0 (diff) | |
| parent | 8aad3131a1d00e191db1b3b27aed6e7fae269f13 (diff) | |
| download | php-git-81ec843d0ee6a7e236cfab15f1908953d7247677.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'ext/zip/php_zip.c')
| -rw-r--r-- | ext/zip/php_zip.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index b9f0bb73ac..cfac566506 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -238,17 +238,17 @@ static int php_zip_extract_file(struct zip * za, char *dest, char *file, int fil return 0; } - stream = php_stream_open_wrapper(fullpath, "w+b", REPORT_ERRORS, NULL); - - if (stream == NULL) { + zf = zip_fopen(za, file, 0); + if (zf == NULL) { n = -1; goto done; } - zf = zip_fopen(za, file, 0); - if (zf == NULL) { + stream = php_stream_open_wrapper(fullpath, "w+b", REPORT_ERRORS, NULL); + + if (stream == NULL) { n = -1; - php_stream_close(stream); + zip_fclose(zf); goto done; } |