X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/8f664e7e91c918cd13248f6b684580c4dd2cdb31..a80c47a8f5806b2163f99fadc374897519499670:/deflate.c

diff --git a/deflate.c b/deflate.c
index a04f86d..d614c37 100644
--- 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:
 	    /*