From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Fri, 11 Jun 2021 00:25:27 +0000 (-0700)
Subject: Added assert in chunkcopy to detect invalid length.
X-Git-Tag: 2.1.0-beta1~569
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2705f826e281917c2c0b3ba4abaf594f7b85f37;p=thirdparty%2Fzlib-ng.git

Added assert in chunkcopy to detect invalid length.
---

diff --git a/chunkset_tpl.h b/chunkset_tpl.h
index 55e07088c..62cd4aa78 100644
--- a/chunkset_tpl.h
+++ b/chunkset_tpl.h
@@ -18,6 +18,7 @@ Z_INTERNAL uint32_t CHUNKSIZE(void) {
    without iteration, which will hopefully make the branch prediction more
    reliable. */
 Z_INTERNAL uint8_t* CHUNKCOPY(uint8_t *out, uint8_t const *from, unsigned len) {
+    Assert(len > 0, "chunkcopy should never have a length 0");
     chunk_t chunk;
     int32_t align = (--len % sizeof(chunk_t)) + 1;
     loadchunk(from, &chunk);
@@ -94,7 +95,7 @@ Z_INTERNAL uint8_t* CHUNKUNROLL(uint8_t *out, unsigned *dist, unsigned *len) {
 Z_INTERNAL uint8_t* CHUNKMEMSET(uint8_t *out, unsigned dist, unsigned len) {
     /* Debug performance related issues when len < sizeof(uint64_t):
        Assert(len >= sizeof(uint64_t), "chunkmemset should be called on larger chunks"); */
-    Assert(dist > 0, "cannot have a distance 0");
+    Assert(dist > 0, "chunkmemset cannot have a distance 0");
 
     unsigned char *from = out - dist;
     chunk_t chunk;