php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-02 13:43:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5'

Browse Source 
* PHP-5.5:
  Reworked the changes for bug #64452
This commit is contained in:
Anatol Belski
2013-03-23 21:01:05 +01:00
parent 37c5425543 ec25e99193
commit 93c4ce4eed
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ext/zip/lib/zip_close.c
View File

@@ -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;