From 8e60c889a2816a63013a35c99ce26bf28f5b78eb Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Tue, 30 Sep 2008 13:57:44 +0300 Subject: [PATCH] Fixed Stream decoder to actually use the first_stream variable. --- src/liblzma/common/stream_decoder.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/liblzma/common/stream_decoder.c b/src/liblzma/common/stream_decoder.c index ab5f2afd..e137685f 100644 --- a/src/liblzma/common/stream_decoder.c +++ b/src/liblzma/common/stream_decoder.c @@ -128,6 +128,11 @@ stream_decode(lzma_coder *coder, lzma_allocator *allocator, return ret == LZMA_FORMAT_ERROR && !coder->first_stream ? LZMA_DATA_ERROR : ret; + // If we are decoding concatenated Streams, and the later + // Streams have invalid Header Magic Bytes, we give + // LZMA_DATA_ERROR instead of LZMA_FORMAT_ERROR. + coder->first_stream = false; + // Copy the type of the Check so that Block Header and Block // decoders see it. coder->block_options.check = coder->stream_flags.check;