Fixed previous match length not reset when match start reset.

https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24294
zlib-ng · Jan 5, 2021 · 446c697 · 446c697
1 parent f82f9ea
commit 446c697
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/deflate.c b/deflate.c
@@ -1254,7 +1254,12 @@ void Z_INTERNAL fill_window(deflate_state *s) {
          */
         if (s->strstart >= wsize+MAX_DIST(s)) {
             memcpy(s->window, s->window+wsize, (unsigned)wsize);
-            s->match_start = (s->match_start >= wsize) ? s->match_start - wsize : 0;
+            if (s->match_start >= wsize) {
+                s->match_start -= wsize;
+            } else {
+                s->match_start = 0;
+                s->prev_length = 0;
+            }
             s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
             s->block_start -= (int)wsize;
             if (s->insert > s->strstart)