diff options
| author | Anatol Belski <ab@php.net> | 2013-03-23 20:57:59 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-03-23 20:57:59 +0100 |
| commit | 638c4b89b7f33a86b45b02f72ee42b25a439863b (patch) | |
| tree | 28c9cdf4b9bbc051e4bdb95d6e06ff8cd697d8b3 | |
| parent | b022e54bd100a914417e216d0872d3e67edecaf9 (diff) | |
| download | php-git-638c4b89b7f33a86b45b02f72ee42b25a439863b.tar.gz | |
Reworked the changes for bug #64452
| -rw-r--r-- | ext/zip/lib/zip_close.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/zip/lib/zip_close.c b/ext/zip/lib/zip_close.c index e66c56697b..576be3b353 100644 --- a/ext/zip/lib/zip_close.c +++ b/ext/zip/lib/zip_close.c @@ -88,9 +88,6 @@ zip_close(struct zip *za) if (za == NULL) return -1; - if (za->zp == NULL) - return -1; - if (!_zip_changed(za, &survivors)) { _zip_free(za); return 0; @@ -196,7 +193,7 @@ zip_close(struct zip *za) } else { /* copy existing directory entries */ - if (fseeko(za->zp, za->cdir->entry[i].offset, SEEK_SET) != 0) { + if ((NULL == za->zp) || (fseeko(za->zp, za->cdir->entry[i].offset, SEEK_SET) != 0)) { _zip_error_set(&za->error, ZIP_ER_SEEK, errno); error = 1; break; |