From: Mika Lindqvist <postmaster@raasu.org>
Date: Thu, 10 Jun 2021 15:23:34 +0000 (+0300)
Subject: [CHUNKMEMSET_SAFE] Precalculate "from".
X-Git-Tag: 2.0.4~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4af20eae037a91cf4c47dd07619891d3261f6227;p=thirdparty%2Fzlib-ng.git

[CHUNKMEMSET_SAFE] Precalculate "from".
* limit len to minimum of len and left
---

diff --git a/chunkset_tpl.h b/chunkset_tpl.h
index 68b7dedee..96f08d118 100644
--- a/chunkset_tpl.h
+++ b/chunkset_tpl.h
@@ -161,10 +161,11 @@ Z_INTERNAL uint8_t* CHUNKMEMSET(uint8_t *out, unsigned dist, unsigned len) {
 }
 
 Z_INTERNAL uint8_t* CHUNKMEMSET_SAFE(uint8_t *out, unsigned dist, unsigned len, unsigned left) {
+    len = MIN(len, left);
     if (left < (unsigned)(3 * sizeof(chunk_t))) {
+        uint8_t *from = out - dist;
         while (len > 0) {
-            *out = *(out - dist);
-            out++;
+            *out++ = *from++;
             --len;
         }
         return out;