diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-11-09 15:38:02 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-11-09 15:38:02 +0000 |
| commit | 653667f9dc9cc0169deeca1a82a60c2e91d5683a (patch) | |
| tree | ac900fcbc6efae43f50daa8009f04669eeebe02d /lib/compress/huf_compress.c | |
| parent | 299df5d48ce3c064ef926ac7814c278bcdc92db0 (diff) | |
Diffstat (limited to 'lib/compress/huf_compress.c')
| -rw-r--r-- | lib/compress/huf_compress.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/compress/huf_compress.c b/lib/compress/huf_compress.c index 2a47c1820526..5692d56e003d 100644 --- a/lib/compress/huf_compress.c +++ b/lib/compress/huf_compress.c @@ -167,7 +167,7 @@ size_t HUF_writeCTable (void* dst, size_t maxDstSize, } -size_t HUF_readCTable (HUF_CElt* CTable, U32 maxSymbolValue, const void* src, size_t srcSize) +size_t HUF_readCTable (HUF_CElt* CTable, U32* maxSymbolValuePtr, const void* src, size_t srcSize) { BYTE huffWeight[HUF_SYMBOLVALUE_MAX + 1]; /* init not required, even though some static analyzer may complain */ U32 rankVal[HUF_TABLELOG_ABSOLUTEMAX + 1]; /* large enough for values from 0 to 16 */ @@ -179,7 +179,7 @@ size_t HUF_readCTable (HUF_CElt* CTable, U32 maxSymbolValue, const void* src, si /* check result */ if (tableLog > HUF_TABLELOG_MAX) return ERROR(tableLog_tooLarge); - if (nbSymbols > maxSymbolValue+1) return ERROR(maxSymbolValue_tooSmall); + if (nbSymbols > *maxSymbolValuePtr+1) return ERROR(maxSymbolValue_tooSmall); /* Prepare base value per rank */ { U32 n, nextRankStart = 0; @@ -208,9 +208,10 @@ size_t HUF_readCTable (HUF_CElt* CTable, U32 maxSymbolValue, const void* src, si min >>= 1; } } /* assign value within rank, symbol order */ - { U32 n; for (n=0; n<=maxSymbolValue; n++) CTable[n].val = valPerRank[CTable[n].nbBits]++; } + { U32 n; for (n=0; n<nbSymbols; n++) CTable[n].val = valPerRank[CTable[n].nbBits]++; } } + *maxSymbolValuePtr = nbSymbols - 1; return readSize; } |