From: Yann Collet <yann.collet.73@gmail.com>
Date: Wed, 25 Nov 2015 20:09:17 +0000 (+0100)
Subject: fixed minor decompression bug in buffered mode
X-Git-Tag: zstd-0.4.0^2~23^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4fdad55dc4e68f0550de77002b7277a330dd143;p=thirdparty%2Fzstd.git

fixed minor decompression bug in buffered mode
---

diff --git a/lib/zstd_buffered.c b/lib/zstd_buffered.c
index 693943da1..242ddf24d 100644
--- a/lib/zstd_buffered.c
+++ b/lib/zstd_buffered.c
@@ -439,11 +439,16 @@ size_t ZBUFF_decompressContinue(ZBUFF_DCtx* zbc, void* dst, size_t* maxDstSizePt
                         if (zbc->outBuff == NULL) return ERROR(memory_allocation);
                     }
                 }
-                memcpy(zbc->inBuff, zbc->headerBuffer, zbc->hPos);
-                zbc->inPos = zbc->hPos;
-                zbc->hPos = 0;
-                zbc->stage = ZBUFFds_load;
-                break;   /* useless : stage follows */
+                if (zbc->hPos)
+                {
+                    /* some data already loaded into headerBuffer : transfer into inBuff */
+                    memcpy(zbc->inBuff, zbc->headerBuffer, zbc->hPos);
+                    zbc->inPos = zbc->hPos;
+                    zbc->hPos = 0;
+                    zbc->stage = ZBUFFds_load;
+                    break;
+                }
+                zbc->stage = ZBUFFds_read;
 
         case ZBUFFds_read:
             {
diff --git a/lib/zstd_decompress.c b/lib/zstd_decompress.c
index 54429628d..34d5d86ae 100644
--- a/lib/zstd_decompress.c
+++ b/lib/zstd_decompress.c
@@ -68,7 +68,6 @@
 #  include "zstd_legacy.h"
 #endif
 
-
 /* *******************************************************
 *  Compiler specifics
 *********************************************************/
@@ -120,7 +119,7 @@ const char* ZSTD_getErrorName(size_t code) { return ERR_getErrorName(code); }
 /* *************************************************************
 *   Context management
 ***************************************************************/
-typedef enum { ZSTDds_getFrameHeaderSize, ZSTDds_decodeFrameHeader, 
+typedef enum { ZSTDds_getFrameHeaderSize, ZSTDds_decodeFrameHeader,
                ZSTDds_decodeBlockHeader, ZSTDds_decompressBlock } ZSTD_dStage;
 
 struct ZSTD_DCtx_s
@@ -449,7 +448,7 @@ static void ZSTD_decodeSequence(seq_t* seq, seqState_t* seqState)
 
     /* Literal length */
     litLength = FSE_decodeSymbol(&(seqState->stateLL), &(seqState->DStream));
-    prevOffset = litLength ? seq->offset : seqState->prevOffset;    
+    prevOffset = litLength ? seq->offset : seqState->prevOffset;
     if (litLength == MaxLL)
     {
         U32 add = *dumps++;
@@ -801,7 +800,7 @@ size_t ZSTD_decompressContinue(ZSTD_DCtx* ctx, void* dst, size_t maxDstSize, con
             /* get frame header size */
             if (srcSize != ZSTD_frameHeaderSize_min) return ERROR(srcSize_wrong);   /* impossible */
             ctx->headerSize = ZSTD_decodeFrameHeader_Part1(ctx, src, ZSTD_frameHeaderSize_min);
-            if (ZSTD_isError(ctx->headerSize)) return ctx->headerSize;            
+            if (ZSTD_isError(ctx->headerSize)) return ctx->headerSize;
             memcpy(ctx->headerBuffer, src, ZSTD_frameHeaderSize_min);
             if (ctx->headerSize > ZSTD_frameHeaderSize_min)
             {