aboutsummaryrefslogtreecommitdiff
path: root/src/liblzma/common/auto_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:16:55 +0300
commit84462afaada61379f5878e46f8f00e25a1cdcf29 (patch)
treeff1811c01a2bcfadfcb23c0df55a0a31ff36367d /src/liblzma/common/auto_decoder.c
parentliblzma: Fix handling of memlimit == 0 in lzma_index_decoder(). (diff)
downloadxz-84462afaada61379f5878e46f8f00e25a1cdcf29.tar.xz
liblzma: Similar memlimit fix for stream_, alone_, and auto_decoder.
Diffstat (limited to '')
-rw-r--r--src/liblzma/common/auto_decoder.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/liblzma/common/auto_decoder.c b/src/liblzma/common/auto_decoder.c
index 09acd6dc..479b150f 100644
--- a/src/liblzma/common/auto_decoder.c
+++ b/src/liblzma/common/auto_decoder.c
@@ -155,9 +155,6 @@ auto_decoder_init(lzma_next_coder *next, const lzma_allocator *allocator,
{
lzma_next_coder_init(&auto_decoder_init, next, allocator);
- if (memlimit == 0)
- return LZMA_PROG_ERROR;
-
if (flags & ~LZMA_SUPPORTED_FLAGS)
return LZMA_OPTIONS_ERROR;
@@ -175,7 +172,7 @@ auto_decoder_init(lzma_next_coder *next, const lzma_allocator *allocator,
coder->next = LZMA_NEXT_CODER_INIT;
}
- coder->memlimit = memlimit;
+ coder->memlimit = my_max(1, memlimit);
coder->flags = flags;
coder->sequence = SEQ_INIT;