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/lzma2_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 'src/liblzma/lzma/lzma2_decoder.c')
-rw-r--r-- | src/liblzma/lzma/lzma2_decoder.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/liblzma/lzma/lzma2_decoder.c b/src/liblzma/lzma/lzma2_decoder.c index 7f1f45f4..4470b4b1 100644 --- a/src/liblzma/lzma/lzma2_decoder.c +++ b/src/liblzma/lzma/lzma2_decoder.c @@ -261,11 +261,8 @@ lzma_lzma2_decoder_init(lzma_next_coder *next, lzma_allocator *allocator, extern uint64_t lzma_lzma2_decoder_memusage(const void *options) { - const uint64_t lzma_memusage = lzma_lzma_decoder_memusage(options); - if (lzma_memusage == UINT64_MAX) - return UINT64_MAX; - - return sizeof(lzma_coder) + lzma_memusage; + return sizeof(lzma_coder) + + lzma_lzma_decoder_memusage_nocheck(options); } |