1 files changed, 14 insertions, 6 deletions
diff --git a/deflate.c b/deflate.c
index 61e34fe..d73a73e 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1556,13 +1556,21 @@ local uInt longest_match(deflate_state *s, IPos cur_match) {
 */
 local void check_match(deflate_state *s, IPos start, IPos match, int length) {
    /* check that the match is indeed a match */
-    if (zmemcmp(s->window + match,
+    Bytef *back = s->window + (int)match, *here = s->window + start;
-                s->window + start, length) != EQUAL) {
+    IPos len = length;
-        fprintf(stderr, " start %u, match %u, length %d\n",
+    if (match == (IPos)-1) {
-                start, match, length);
+        /* match starts one byte before the current window -- just compare the
+           subsequent length-1 bytes */
+        back++;
+        here++;
+        len--;
+    }
+    if (zmemcmp(back, here, len) != EQUAL) {
+        fprintf(stderr, " start %u, match %d, length %d\n",
+                start, (int)match, length);
        do {
-            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
+            fprintf(stderr, "(%02x %02x)", *back++, *here++);
-        } while (--length != 0);
+        } while (--len != 0);
        z_error("invalid match");
    }
    if (z_verbose > 1) {