From: Yann Collet Date: Tue, 26 Sep 2017 22:36:57 +0000 (-0700) Subject: switch assert() position X-Git-Tag: v1.3.2~3^2~23^2~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0dd960363d0d4c1b437b326d2461f5c4005d954;p=thirdparty%2Fzstd.git switch assert() position --- diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c index 84192b580..6c142919b 100644 --- a/lib/decompress/zstd_decompress.c +++ b/lib/decompress/zstd_decompress.c @@ -157,6 +157,8 @@ static size_t ZSTD_startingInputLength(ZSTD_format_e format) ZSTD_frameHeaderSize_prefix - ZSTD_frameIdSize : ZSTD_frameHeaderSize_prefix; ZSTD_STATIC_ASSERT(ZSTD_FRAMEHEADERSIZE_PREFIX >= ZSTD_FRAMEIDSIZE); + /* only supports formats ZSTD_f_zstd1 and ZSTD_f_zstd1_magicless */ + assert( (format == ZSTD_f_zstd1) || (format == ZSTD_f_zstd1_magicless) ); return startingInputLength; } @@ -315,8 +317,6 @@ static size_t ZSTD_getFrameHeader_internal(ZSTD_frameHeader* zfhPtr, const void* const BYTE* ip = (const BYTE*)src; size_t const minInputSize = ZSTD_startingInputLength(format); - /* only supports formats ZSTD_f_zstd1 and ZSTD_f_zstd1_magicless */ - assert( (format == ZSTD_f_zstd1) || (format == ZSTD_f_zstd1_magicless) ); if (srcSize < minInputSize) return minInputSize; if ( (format != ZSTD_f_zstd1_magicless)