diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2008-12-01 22:58:22 +0200 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2008-12-01 22:58:22 +0200 |
| commit | c596fda40b62fe1683d0ac34d0c673dcaae2aa15 (patch) | |
| tree | 1b099c2513d78705262672c25cf4cd4de01a84f7 /src/liblzma/lzma/lzma_decoder.c | |
| parent | Added the changes for Delta filter that should have been (diff) | |
| download | xz-c596fda40b62fe1683d0ac34d0c673dcaae2aa15.tar.xz | |
Make the memusage functions of LZMA1 and LZMA2 decoders
to validate the filter options.
Diffstat (limited to '')
| -rw-r--r-- | src/liblzma/lzma/lzma_decoder.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/liblzma/lzma/lzma_decoder.c b/src/liblzma/lzma/lzma_decoder.c index df3371e2..03e3251a 100644 --- a/src/liblzma/lzma/lzma_decoder.c +++ b/src/liblzma/lzma/lzma_decoder.c @@ -1012,14 +1012,20 @@ lzma_lzma_lclppb_decode(lzma_options_lzma *options, uint8_t byte) extern uint64_t -lzma_lzma_decoder_memusage(const void *options) +lzma_lzma_decoder_memusage_nocheck(const void *options) { const lzma_options_lzma *const opt = options; - const uint64_t lz_memusage = lzma_lz_decoder_memusage(opt->dict_size); - if (lz_memusage == UINT64_MAX) + return sizeof(lzma_coder) + lzma_lz_decoder_memusage(opt->dict_size); +} + + +extern uint64_t +lzma_lzma_decoder_memusage(const void *options) +{ + if (!is_lclppb_valid(options)) return UINT64_MAX; - return sizeof(lzma_coder) + lz_memusage; + return lzma_lzma_decoder_memusage_nocheck(options); } |