sharpetronics/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-12-07 00:02:39 -05:00
Code Issues Projects Releases Wiki Activity

fixed bus error bug

Browse Source
This commit is contained in:
Paul Cruz 2017-06-23 11:22:29 -07:00
parent 2e8cc6f12a
commit 4219acc60a
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/decodecorpus.c
View File

@ -672,7 +672,6 @@ static U32 generateSequences(U32* seed, frame_t* frame, seqStore_t* seqStore,
memcpy(srcPtr, literals, literalLen); memcpy(srcPtr, literals, literalLen);
srcPtr += literalLen; srcPtr += literalLen;
do { do {
if (RAND(seed) & 7) { if (RAND(seed) & 7) {
/* do a normal offset */ /* do a normal offset */
@ -682,16 +681,22 @@ static U32 generateSequences(U32* seed, frame_t* frame, seqStore_t* seqStore,
1; 1;
if (info.useDict && (RAND(seed) & 1)) { if (info.useDict && (RAND(seed) & 1)) {
/* need to occasionally generate offsets that go past the start */ /* need to occasionally generate offsets that go past the start */
U32 const lenPastStart = (RAND(seed) % info.dictContentSize) + 1; U32 lenPastStart = (RAND(seed) % info.dictContentSize) + 1;
offset = ((BYTE*)srcPtr - (BYTE*)frame->srcStart)+lenPastStart; offset = ((BYTE*)srcPtr - (BYTE*)frame->srcStart)+lenPastStart;
if (lenPastStart > frame->header.windowSize) {
matchLen = MIN(matchLen, frame->header.windowSize);
}
if (offset > frame->header.windowSize) { if (offset > frame->header.windowSize) {
if (lenPastStart < MIN_SEQ_LEN) {
/* when offset > windowSize, matchLen bound by end of dictionary (lenPastStart) */
/* this also means that lenPastStart must be greater than MIN_SEQ_LEN */
/* make sure lenPastStart does not go past dictionary start though */
lenPastStart = MIN(lenPastStart+MIN_SEQ_LEN, info.dictContentSize);
offset = ((BYTE*)srcPtr - (BYTE*)frame->srcStart) + lenPastStart;
}
{
U32 const matchLenBound = MIN(frame->header.windowSize, lenPastStart); U32 const matchLenBound = MIN(frame->header.windowSize, lenPastStart);
matchLen = MIN(matchLen, matchLenBound); matchLen = MIN(matchLen, matchLenBound);
} }
} }
}
offsetCode = offset + ZSTD_REP_MOVE; offsetCode = offset + ZSTD_REP_MOVE;
repIndex = 2; repIndex = 2;
} else { } else {
@ -713,7 +718,7 @@ static U32 generateSequences(U32* seed, frame_t* frame, seqStore_t* seqStore,
size_t j; size_t j;
BYTE* const dictEnd = info.dictContent + info.dictContentSize; BYTE* const dictEnd = info.dictContent + info.dictContentSize;
for (j = 0; j < matchLen; j++) { for (j = 0; j < matchLen; j++) {
if ((void*)(srcPtr - offset) < (void*)frame->srcStart) { if (((BYTE*)srcPtr - (BYTE*)frame->srcStart) < offset) {
/* copy from dictionary instead of literals */ /* copy from dictionary instead of literals */
size_t const dictOffset = offset - (srcPtr - (BYTE*)frame->srcStart); size_t const dictOffset = offset - (srcPtr - (BYTE*)frame->srcStart);
*srcPtr = *(dictEnd - dictOffset); *srcPtr = *(dictEnd - dictOffset);