diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-06-05 22:11:07 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-06-07 21:01:31 +0200 |
| commit | f4a44f18b8fe5d23a11d12b048d4effce283379f (patch) | |
| tree | 35850a34200dc4be272f16fa486f83a4f25194dd /ext/zip/lib/zip_open.c | |
| parent | a39bcfc5ee3931c25bdbc5dc2409e6d9dd98ff52 (diff) | |
| download | php-git-f4a44f18b8fe5d23a11d12b048d4effce283379f.tar.gz | |
rechecked the merged libzip, took also the indents from the original to
avoid confusion next time
Diffstat (limited to 'ext/zip/lib/zip_open.c')
| -rw-r--r-- | ext/zip/lib/zip_open.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/zip/lib/zip_open.c b/ext/zip/lib/zip_open.c index 11c6fe05a6..5aba34f67a 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; |