Skip to content

legacy/v0.5: fix streaming regression from the wrap history fix #4816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ManoharPaturi wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

legacy/v0.5: fix streaming regression from the wrap history fix #4816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions lib/legacy/zstd_v05.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3893,7 +3893,10 @@ size_t ZBUFFv05_decompressContinue(ZBUFFv05_DCtx* zbc, void* dst, size_t* maxDst
case ZBUFFv05ds_decodeHeader:
/* apply header to create / resize buffers */
{
size_t neededOutSize = (size_t)1 << zbc->params.windowLog;
/* note : also provide space for one full block, so that the
* history preserved at wrap time never fills the whole buffer
* and the next block always has room to decode into. */
size_t neededOutSize = ((size_t)1 << zbc->params.windowLog) + BLOCKSIZE;
size_t neededInSize = BLOCKSIZE; /* a block is never > BLOCKSIZE */
if (zbc->inBuffSize < neededInSize) {
free(zbc->inBuff);
Expand Down Expand Up @@ -3972,15 +3975,8 @@ size_t ZBUFFv05_decompressContinue(ZBUFFv05_DCtx* zbc, void* dst, size_t* maxDst
zbc->outStart += flushedSize;
if (flushedSize == toFlushSize) {
zbc->stage = ZBUFFv05ds_read;
if (zbc->outStart + BLOCKSIZE > zbc->outBuffSize) {
/* Not enough room for next block - need to wrap buffer.
* Preserve history: copy the last windowSize bytes to the
* beginning so that back-references can still find valid data. */
size_t const windowSize = (size_t)1 << zbc->params.windowLog;
size_t const preserveSize = MIN(zbc->outEnd, windowSize);
memmove(zbc->outBuff, zbc->outBuff + zbc->outEnd - preserveSize, preserveSize);
zbc->outStart = zbc->outEnd = preserveSize;
}
if (zbc->outStart + BLOCKSIZE > zbc->outBuffSize)
zbc->outStart = zbc->outEnd = 0;
break;
}
/* cannot flush everything */
Expand Down
Loading