Try to merge across changes in zlib from 1.1.2 to 1.1.3.

[rsync/rsync.git] / zlib / infblock.c

diff --git a/zlib/infblock.c b/zlib/infblock.c
index 3d6701e..1c221dd 100644 (file)
--- a/zlib/infblock.c
+++ b/zlib/infblock.c
@@ -345,13 +345,6 @@ int r;
         s->mode = TYPE;
         break;
       }
-      if (k > 7)              /* return unused byte, if any */
-      {
-        Assert(k < 16, "inflate_codes grabbed too many bytes")
-        k -= 8;
-        n++;
-        p--;                    /* can always return one */
-      }
       s->mode = DRY;
     case DRY:
       FLUSH