facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix incorrect index increment in merge algorithm

Browse Source
This commit is contained in:
senhuang42 2020-11-02 10:58:18 -05:00
parent a36fdada57
commit e8501e00b8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/compress/zstd_compress.c
View File

@ -2569,22 +2569,24 @@ size_t ZSTD_getSequences(ZSTD_CCtx* zc, ZSTD_Sequence* outSeqs,
ZSTD_customFree(dst, ZSTD_defaultCMem); ZSTD_customFree(dst, ZSTD_defaultCMem);
if (format == ZSTD_sf_noBlockDelimiters) { if (format == ZSTD_sf_noBlockDelimiters) {
/* Merge the dummy block delimiters */
size_t i = 0; size_t i = 0;
size_t totalSeqs = zc->seqCollector.seqIndex; size_t totalSeqs = zc->seqCollector.seqIndex;
for (; i < totalSeqs; ++i) { while(i < totalSeqs) {
if (seqCollector.seqStart[i].offset == 0 && seqCollector.seqStart[i].matchLength == 0) { if (seqCollector.seqStart[i].offset == 0 && seqCollector.seqStart[i].matchLength == 0) {
/* Merge the block boundary or last literals */ /* Merge the block boundary or last literals */
if (i != totalSeqs-1) { if (i != totalSeqs-1) {
/* Add last literals to next sequence, then "delete" this sequence */ /* Add last literals to next sequence, then "delete" this sequence */
seqCollector.seqStart[i+1].litLength += seqCollector.seqStart[i].litLength; seqCollector.seqStart[i+1].litLength += seqCollector.seqStart[i].litLength;
memmove(seqCollector.seqStart+i, seqCollector.seqStart+i+1, (totalSeqs-i-1)*sizeof(ZSTD_sequence)); memmove(seqCollector.seqStart+i, seqCollector.seqStart+i+1, (totalSeqs-i-1)*sizeof(ZSTD_Sequence));
} }
totalSeqs--; totalSeqs--;
} else {
++i;
} }
} }
zc->seqCollector.seqIndex = totalSeqs; zc->seqCollector.seqIndex = totalSeqs;
} }
return zc->seqCollector.seqIndex; return zc->seqCollector.seqIndex;
} }