diff options
| author | Ladislav Zezula <ladislav.zezula@avg.com> | 2013-10-10 08:42:13 +0200 |
|---|---|---|
| committer | Ladislav Zezula <ladislav.zezula@avg.com> | 2013-10-10 08:42:13 +0200 |
| commit | 88b74cc6aff6df067837ded12c30fe59800a8a95 (patch) | |
| tree | f5fa89cea35fccccf90304e63fe478f8b317bd01 /src/zlib/adler32.c | |
| parent | 24f9faffc938e812ba545d204b9e56052c22ae63 (diff) | |
+ Fixed crash when TMPQFile failed to allocate
+ ZLIB updated
Diffstat (limited to 'src/zlib/adler32.c')
| -rw-r--r-- | src/zlib/adler32.c | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/src/zlib/adler32.c b/src/zlib/adler32.c index 65ad6a5..007ba26 100644 --- a/src/zlib/adler32.c +++ b/src/zlib/adler32.c @@ -1,15 +1,12 @@ /* adler32.c -- compute the Adler-32 checksum of a data stream - * Copyright (C) 1995-2007 Mark Adler + * Copyright (C) 1995-2004 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ /* @(#) $Id$ */ -#include "zutil.h" - -#define local static - -local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2); +#define ZLIB_INTERNAL +#include "zlib.h" #define BASE 65521UL /* largest prime smaller than 65536 */ #define NMAX 5552 @@ -128,10 +125,10 @@ uLong ZEXPORT adler32(adler, buf, len) } /* ========================================================================= */ -local uLong adler32_combine_(adler1, adler2, len2) +uLong ZEXPORT adler32_combine(adler1, adler2, len2) uLong adler1; uLong adler2; - z_off64_t len2; + z_off_t len2; { unsigned long sum1; unsigned long sum2; @@ -144,26 +141,9 @@ local uLong adler32_combine_(adler1, adler2, len2) MOD(sum2); sum1 += (adler2 & 0xffff) + BASE - 1; sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; - if (sum1 >= BASE) sum1 -= BASE; - if (sum1 >= BASE) sum1 -= BASE; - if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1); - if (sum2 >= BASE) sum2 -= BASE; + if (sum1 > BASE) sum1 -= BASE; + if (sum1 > BASE) sum1 -= BASE; + if (sum2 > (BASE << 1)) sum2 -= (BASE << 1); + if (sum2 > BASE) sum2 -= BASE; return sum1 | (sum2 << 16); } - -/* ========================================================================= */ -uLong ZEXPORT adler32_combine(adler1, adler2, len2) - uLong adler1; - uLong adler2; - z_off_t len2; -{ - return adler32_combine_(adler1, adler2, len2); -} - -uLong ZEXPORT adler32_combine64(adler1, adler2, len2) - uLong adler1; - uLong adler2; - z_off64_t len2; -{ - return adler32_combine_(adler1, adler2, len2); -} |