From: Lasse Collin <lasse.collin@tukaani.org>
Date: Mon, 14 Jan 2008 10:08:02 +0000 (+0200)
Subject: In lzma_read_match_distances(), don't use
X-Git-Tag: upstream/5.1.3~852
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e09e1c05871f3757f759b801890ccccc9286608;p=platform%2Fupstream%2Fxz.git

In lzma_read_match_distances(), don't use
coder->lz.stream_end_was_reached. That variable
will be removed, and the check isn't required anyway.
Rearrange the check so that it doesn't make one to
think that there could be an integer overflow.
---

diff --git a/src/liblzma/lzma/lzma_encoder_private.h b/src/liblzma/lzma/lzma_encoder_private.h
index 7fb1566..9ecbc1c 100644
--- a/src/liblzma/lzma/lzma_encoder_private.h
+++ b/src/liblzma/lzma/lzma_encoder_private.h
@@ -197,12 +197,12 @@ lzma_read_match_distances(lzma_coder *coder,
 			uint32_t limit = MATCH_MAX_LEN - *len_res;
 
 			assert(offset + limit < coder->lz.keep_size_after);
+			assert(coder->lz.read_pos <= coder->lz.write_pos);
 
 			// If we are close to end of the stream, we may need
 			// to limit the length of the match.
-			if (coder->lz.stream_end_was_reached
-					&& coder->lz.write_pos
-					< coder->lz.read_pos + offset + limit)
+			if (coder->lz.write_pos - coder->lz.read_pos
+					< offset + limit)
 				limit = coder->lz.write_pos
 					- (coder->lz.read_pos + offset);