From c85d10d0ea5b4aebcf5cb4f2abb253f6de860658 Mon Sep 17 00:00:00 2001 From: Sen Huang Date: Fri, 8 Nov 2019 11:20:57 -0500 Subject: [PATCH] Remove mixed declarations --- lib/dictBuilder/zdict.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/dictBuilder/zdict.c b/lib/dictBuilder/zdict.c index 9cee71be..344ab446 100644 --- a/lib/dictBuilder/zdict.c +++ b/lib/dictBuilder/zdict.c @@ -102,25 +102,26 @@ unsigned ZDICT_getDictID(const void* dictBuffer, size_t dictSize) size_t ZDICT_getDictHeaderSize(const void* dictBuffer, size_t dictSize) { + size_t headerSize; if (dictSize <= 8 || MEM_readLE32(dictBuffer) != ZSTD_MAGIC_DICTIONARY) return ERROR(dictionary_corrupted); - { size_t headerSize; - unsigned offcodeMaxValue = MaxOff; + { unsigned offcodeMaxValue = MaxOff; ZSTD_compressedBlockState_t* bs = (ZSTD_compressedBlockState_t*)malloc(sizeof(ZSTD_compressedBlockState_t)); - if (!bs) return ERROR(memory_allocation); U32* wksp = (U32*)malloc(HUF_WORKSPACE_SIZE); - if (!wksp) return ERROR(memory_allocation); short* offcodeNCount = (short*)malloc((MaxOff+1)*sizeof(short)); - if (!offcodeNCount) return ERROR(memory_allocation); + if (!bs || !wksp || !offcodeNCount) { + headerSize = ERROR(memory_allocation); + } else { + ZSTD_reset_compressedBlockState(bs); + headerSize = ZSTD_loadCEntropy(bs, wksp, offcodeNCount, &offcodeMaxValue, dictBuffer, dictSize); + } - ZSTD_reset_compressedBlockState(bs); - headerSize = ZSTD_loadCEntropy(bs, wksp, offcodeNCount, &offcodeMaxValue, dictBuffer, dictSize); - free(bs); free(wksp); free(offcodeNCount); - return headerSize; } + + return headerSize; } /*-********************************************************