From: Mika Lindqvist <postmaster@raasu.org>
Date: Tue, 26 Apr 2016 10:04:50 +0000 (+0300)
Subject: Fix Coverity warnings.
X-Git-Tag: 1.9.9-b1~789^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F67%2Fhead;p=thirdparty%2Fzlib-ng.git

Fix Coverity warnings.
---

diff --git a/arch/x86/deflate_quick.c b/arch/x86/deflate_quick.c
index 3088200e..b5190d59 100644
--- a/arch/x86/deflate_quick.c
+++ b/arch/x86/deflate_quick.c
@@ -220,6 +220,9 @@ ZLIB_INTERNAL block_state deflate_quick(deflate_state *s, int flush) {
                     if (match_len > s->lookahead)
                         match_len = s->lookahead;
 
+                    if (match_len > MAX_MATCH)
+                        match_len = MAX_MATCH;
+
                     static_emit_ptr(s, match_len - MIN_MATCH, s->strstart - hash_head);
                     s->lookahead -= match_len;
                     s->strstart += match_len;
diff --git a/test/minigzip.c b/test/minigzip.c
index 15f17040..9c71fd1b 100644
--- a/test/minigzip.c
+++ b/test/minigzip.c
@@ -65,13 +65,13 @@ void myfree (void *, void *);
 
 void *myalloc(void *q, unsigned n, unsigned m)
 {
-    q = Z_NULL;
+    (void)q;
     return calloc(n, m);
 }
 
 void myfree(void *q, void *p)
 {
-    q = Z_NULL;
+    (void)q;
     free(p);
 }