Apply r6972 from my other copy of deflate.c: don't lose the BFINAL bit

[sgt/halibut] / deflate.c

diff --git a/deflate.c b/deflate.c
index a04f86d..d614c37 100644 (file)
--- a/deflate.c
+++ b/deflate.c
@@ -2441,15 +2441,18 @@ int deflate_decompress_data(deflate_decompress_ctx *dctx,
             */
            if (dctx->nbits < 16)
                goto finished;
-           nlen = 0xFFFF & ~dctx->bits;
+           nlen = dctx->bits & 0xFFFF;
            EATBITS(16);
            if (dctx->uncomplen != (nlen ^ 0xFFFF)) {
                 error = DEFLATE_ERR_UNCOMP_HDR;
                 goto finished;
             }
-           if (dctx->uncomplen == 0)
-               dctx->state = OUTSIDEBLK;       /* block is empty */
-           else
+           if (dctx->uncomplen == 0) {/* block is empty */
+               if (dctx->lastblock)
+                   dctx->state = END;
+               else
+                   dctx->state = OUTSIDEBLK;
+           } else
                dctx->state = UNCOMP_DATA;
            break;
          case UNCOMP_DATA:
@@ -2462,8 +2465,12 @@ int deflate_decompress_data(deflate_decompress_ctx *dctx,
 #endif
            emit_char(dctx, dctx->bits & 0xFF);
            EATBITS(8);
-           if (--dctx->uncomplen == 0)
-               dctx->state = OUTSIDEBLK;       /* end of uncompressed block */
+           if (--dctx->uncomplen == 0) {       /* end of uncompressed block */
+               if (dctx->lastblock)
+                   dctx->state = END;
+               else
+                   dctx->state = OUTSIDEBLK;
+           }
            break;
          case END:
            /*