From: Yann Collet <yann.collet.73@gmail.com>
Date: Sun, 17 Jul 2016 13:39:24 +0000 (+0200)
Subject: fixed : premature frame end on zero-sized raw block - reported by @ebiggers
X-Git-Tag: v0.8.0^2~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=972e5806ee4a72ae3e42c219e26a23cd09595644;p=thirdparty%2Fzstd.git

fixed : premature frame end on zero-sized raw block - reported by @ebiggers
---

diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c
index a48c9abdf..7ccfb963d 100644
--- a/lib/decompress/zstd_decompress.c
+++ b/lib/decompress/zstd_decompress.c
@@ -1013,7 +1013,7 @@ static size_t ZSTD_decompressFrame(ZSTD_DCtx* dctx,
         default:
             return ERROR(GENERIC);   /* impossible */
         }
-        if (cBlockSize == 0) break;   /* bt_end */
+        if (blockProperties.blockType == bt_end) break;   /* bt_end */
 
         if (ZSTD_isError(decodedSize)) return decodedSize;
         if (dctx->fParams.checksumFlag) XXH64_update(&dctx->xxhState, op, decodedSize);