aboutsummaryrefslogtreecommitdiff
path: root/src/liblzma/common/stream_decoder.c
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2017-03-30 19:16:55 +0300
committerLasse Collin <lasse.collin@tukaani.org>2017-03-30 19:52:24 +0300
commitef36c6362f3f3853f21b8a6359bcd06576ebf207 (patch)
tree041c1a0467662fd0f208687d0a02bc408eb32957 /src/liblzma/common/stream_decoder.c
parentliblzma: Fix handling of memlimit == 0 in lzma_index_decoder(). (diff)
downloadxz-ef36c6362f3f3853f21b8a6359bcd06576ebf207.tar.xz
liblzma: Similar memlimit fix for stream_, alone_, and auto_decoder.
Diffstat (limited to '')
-rw-r--r--src/liblzma/common/stream_decoder.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/liblzma/common/stream_decoder.c b/src/liblzma/common/stream_decoder.c
index 7ae7a670..fdd8ff2f 100644
--- a/src/liblzma/common/stream_decoder.c
+++ b/src/liblzma/common/stream_decoder.c
@@ -422,9 +422,6 @@ lzma_stream_decoder_init(
{
lzma_next_coder_init(&lzma_stream_decoder_init, next, allocator);
- if (memlimit == 0)
- return LZMA_PROG_ERROR;
-
if (flags & ~LZMA_SUPPORTED_FLAGS)
return LZMA_OPTIONS_ERROR;
@@ -444,7 +441,7 @@ lzma_stream_decoder_init(
coder->index_hash = NULL;
}
- coder->memlimit = memlimit;
+ coder->memlimit = my_max(1, memlimit);
coder->memusage = LZMA_MEMUSAGE_BASE;
coder->tell_no_check = (flags & LZMA_TELL_NO_CHECK) != 0;
coder->tell_unsupported_check