diff options
| author | Anatol Belski <ab@php.net> | 2013-03-23 20:59:47 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-03-23 20:59:47 +0100 |
| commit | 04b492a5fef25c70fb42b0734e04d44cbc5a9241 (patch) | |
| tree | 133cc8f33c99779ddce85bf7a60d35bd840e8b23 | |
| parent | 3654ff73660a6b8fbf2a696effe844bb9485ff17 (diff) | |
| parent | 638c4b89b7f33a86b45b02f72ee42b25a439863b (diff) | |
| download | php-git-04b492a5fef25c70fb42b0734e04d44cbc5a9241.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
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; |