From: Lasse Collin <lasse.collin@tukaani.org>
Date: Tue, 30 Sep 2008 10:57:44 +0000 (+0300)
Subject: Fixed Stream decoder to actually use the first_stream variable.
X-Git-Tag: v4.999.7beta~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e60c889a2816a63013a35c99ce26bf28f5b78eb;p=xz

Fixed Stream decoder to actually use the first_stream variable.
---

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;