diff options
author | acidmanifesto <joshua.lee.betts@gmail.com> | 2022-04-15 11:46:36 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-15 12:46:36 -0300 |
commit | 0103c896f90886e8dcf80c0b32baf6177e9d7da3 (patch) | |
tree | b74323f12b3b20c7811b37850ee5af2bb67c491b /deps/zlib/adler32.c | |
parent | 3d609bfd240c4d99d3c526dd250eb5e037672deb (diff) |
chore(Core\Dep): Zlib 1.2.7 to 1.2.12 (#11401)
version 1.2.7, May 2nd, 2012 to
version 1.2.12, March 11th, 2022
Ref Security Issue:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-25032
Diffstat (limited to 'deps/zlib/adler32.c')
-rw-r--r-- | deps/zlib/adler32.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/deps/zlib/adler32.c b/deps/zlib/adler32.c index a868f073d8..d0be4380a3 100644 --- a/deps/zlib/adler32.c +++ b/deps/zlib/adler32.c @@ -1,5 +1,5 @@ /* adler32.c -- compute the Adler-32 checksum of a data stream - * Copyright (C) 1995-2011 Mark Adler + * Copyright (C) 1995-2011, 2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -7,11 +7,9 @@ #include "zutil.h" -#define local static - local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); -#define BASE 65521 /* largest prime smaller than 65536 */ +#define BASE 65521U /* largest prime smaller than 65536 */ #define NMAX 5552 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ @@ -62,10 +60,10 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); #endif /* ========================================================================= */ -uLong ZEXPORT adler32(adler, buf, len) +uLong ZEXPORT adler32_z(adler, buf, len) uLong adler; const Bytef *buf; - uInt len; + z_size_t len; { unsigned long sum2; unsigned n; @@ -133,6 +131,15 @@ uLong ZEXPORT adler32(adler, buf, len) } /* ========================================================================= */ +uLong ZEXPORT adler32(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len; +{ + return adler32_z(adler, buf, len); +} + +/* ========================================================================= */ local uLong adler32_combine_(adler1, adler2, len2) uLong adler1; uLong adler2; @@ -156,7 +163,7 @@ local uLong adler32_combine_(adler1, adler2, len2) 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 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1); if (sum2 >= BASE) sum2 -= BASE; return sum1 | (sum2 << 16); } |