From 9f5ab1a4f5d735b93f8ab881808a863d7f147ce8 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 11 Dec 2015 00:27:41 +0100 Subject: [PATCH] fix 32-bits windows decoding on high-compression archives --- lib/zstd_decompress.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/zstd_decompress.c b/lib/zstd_decompress.c index d1e01c3e5..e1c30a8d6 100644 --- a/lib/zstd_decompress.c +++ b/lib/zstd_decompress.c @@ -527,14 +527,11 @@ FORCE_INLINE size_t ZSTD_execSequence(BYTE* op, *litPtr = litEnd; /* update for next sequence */ /* copy Match */ - /* check */ - //if (match > oLitEnd) return ERROR(corruption_detected); /* address space overflow test (is clang optimizer wrongly removing this test ?) */ - if (sequence.offset > (size_t)oLitEnd) return ERROR(corruption_detected); /* address space overflow test (this test seems preserved by clang optimizer) */ - - if (match < base) + if (sequence.offset > (size_t)(oLitEnd - base)) { /* offset beyond prefix */ - if (match < vBase) return ERROR(corruption_detected); + if (sequence.offset > (size_t)(oLitEnd - vBase)) + return ERROR(corruption_detected); match = dictEnd - (base-match); if (match + sequence.matchLength <= dictEnd) { @@ -773,8 +770,6 @@ size_t ZSTD_decompressContinue(ZSTD_DCtx* ctx, void* dst, size_t maxDstSize, con if (srcSize != ctx->expected) return ERROR(srcSize_wrong); if (dst != ctx->previousDstEnd) /* not contiguous */ { - if ((dst > ctx->base) && (dst < ctx->previousDstEnd)) /* rolling buffer : new segment into dictionary */ - ctx->base = (char*)dst; /* temporary affectation, for vBase calculation */ ctx->dictEnd = ctx->previousDstEnd; ctx->vBase = (const char*)dst - ((const char*)(ctx->previousDstEnd) - (const char*)(ctx->base)); ctx->base = dst; -- 2.47.2