Commit: f4a44f18b8fe5d23a11d12b048d4effce283379f Author: Anatoliy Belsky <a...@php.net> Tue, 5 Jun 2012 22:11:07 +0200 Parents: a39bcfc5ee3931c25bdbc5dc2409e6d9dd98ff52 Branches: PHP-5.3 PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f4a44f18b8fe5d23a11d12b048d4effce283379f Log: rechecked the merged libzip, took also the indents from the original to avoid confusion next time Changed paths: M ext/zip/lib/zip_close.c M ext/zip/lib/zip_delete.c M ext/zip/lib/zip_dirent.c M ext/zip/lib/zip_fopen_index.c M ext/zip/lib/zip_fread.c M ext/zip/lib/zip_open.c Diff: diff --git a/ext/zip/lib/zip_close.c b/ext/zip/lib/zip_close.c index b0e3c75..362f92d 100644 --- a/ext/zip/lib/zip_close.c +++ b/ext/zip/lib/zip_close.c @@ -316,22 +316,22 @@ zip_close(struct zip *za) free(temp); return -1; } - - if (za->zp) { - fclose(za->zp); - za->zp = NULL; - reopen_on_error = 1; + + if (za->zp) { + fclose(za->zp); + za->zp = NULL; + reopen_on_error = 1; } if (_zip_rename(temp, za->zn) != 0) { - _zip_error_set(&za->error, ZIP_ER_RENAME, errno); - remove(temp); - free(temp); - if (reopen_on_error) { - /* ignore errors, since we're already in an error case */ - za->zp = fopen(za->zn, "rb"); - } - return -1; + _zip_error_set(&za->error, ZIP_ER_RENAME, errno); + remove(temp); + free(temp); + if (reopen_on_error) { + /* ignore errors, since we're already in an error case */ + za->zp = fopen(za->zn, "rb"); } + return -1; + } #ifndef PHP_WIN32 mask = umask(0); umask(mask); diff --git a/ext/zip/lib/zip_delete.c b/ext/zip/lib/zip_delete.c index da3e65b..131d444 100644 --- a/ext/zip/lib/zip_delete.c +++ b/ext/zip/lib/zip_delete.c @@ -40,7 +40,7 @@ ZIP_EXTERN(int) zip_delete(struct zip *za, zip_uint64_t idx) { - if (idx < 0 || idx >= za->nentry) { + if (idx >= za->nentry) { _zip_error_set(&za->error, ZIP_ER_INVAL, 0); return -1; } diff --git a/ext/zip/lib/zip_dirent.c b/ext/zip/lib/zip_dirent.c index 6cb9ee3..b5b9d27 100644 --- a/ext/zip/lib/zip_dirent.c +++ b/ext/zip/lib/zip_dirent.c @@ -472,7 +472,7 @@ _zip_dirent_write(struct zip_dirent *zde, FILE *fp, int localp, static time_t _zip_d2u_time(int dtime, int ddate) { - struct tm tm = {0}; + struct tm tm; memset(&tm, 0, sizeof(tm)); diff --git a/ext/zip/lib/zip_fopen_index.c b/ext/zip/lib/zip_fopen_index.c index 5c777ee..b60fd33 100644 --- a/ext/zip/lib/zip_fopen_index.c +++ b/ext/zip/lib/zip_fopen_index.c @@ -39,7 +39,6 @@ #include "zipint.h" - ZIP_EXTERN(struct zip_file *) diff --git a/ext/zip/lib/zip_fread.c b/ext/zip/lib/zip_fread.c index 4c828a8..a6c0851b 100644 --- a/ext/zip/lib/zip_fread.c +++ b/ext/zip/lib/zip_fread.c @@ -60,15 +60,6 @@ zip_fread(struct zip_file *zf, void *outbuf, zip_uint64_t toread) _zip_error_set_from_source(&zf->error, zf->src); return -1; } - - /* XXX the following left from the previous PHP port, let's see how to use it now */ - /*zf->zstr->next_out = (Bytef *)outbuf; - zf->zstr->avail_out = toread; - out_before = zf->zstr->total_out;*/ - - /* endless loop until something has been accomplished */ - /*for (;;) { - ret = inflate(zf->zstr, Z_SYNC_FLUSH);*/ return n; } diff --git a/ext/zip/lib/zip_open.c b/ext/zip/lib/zip_open.c index 11c6fe0..5aba34f 100644 --- a/ext/zip/lib/zip_open.c +++ b/ext/zip/lib/zip_open.c @@ -357,17 +357,17 @@ _zip_check_torrentzip(struct zip *za) if (za->cdir->comment_len != TORRENT_SIG_LEN+8 || strncmp(za->cdir->comment, TORRENT_SIG, TORRENT_SIG_LEN) != 0) return; - + memcpy(buf, za->cdir->comment+TORRENT_SIG_LEN, 8); buf[8] = '\0'; errno = 0; crc_should = strtoul(buf, &end, 16); if ((crc_should == UINT_MAX && errno != 0) || (end && *end)) return; - + if (_zip_filerange_crc(za->zp, za->cdir->offset, za->cdir->size, &crc_got, NULL) < 0) - return; + return; if (crc_got == crc_should) za->flags |= ZIP_AFL_TORRENT; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
