diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-03-29 01:32:44 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-03-29 01:32:44 +0100 |
| commit | cf099ba2ee4e438bae16c3670a14ce0c4390529a (patch) | |
| tree | 062683b6a7226ded35262e94c933b9bd81199314 /ext/zip/lib | |
| parent | f21eff8954d5956842795ea5653a9a5b8d62caa3 (diff) | |
| download | php-cf099ba2ee4e438bae16c3670a14ce0c4390529a.tar.gz | |
Imported Upstream version 5.5.0~beta2upstream/5.5.0_beta2
Diffstat (limited to 'ext/zip/lib')
| -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 e66c56697..576be3b35 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; |