From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 23 May 2019 12:54:13 +0000 (+0200)
Subject: bunzip2: the correct condition is "n < groupCount", not "n <= groupCount". Closes... 
X-Git-Tag: 1_31_0~40
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=58d998d2f927c20f2ba728611df587ac8ec8bda9;p=oweals%2Fbusybox.git

bunzip2: the correct condition is "n < groupCount", not "n <= groupCount". Closes 11896

function                                             old     new   delta
get_next_block                                      1677    1681      +4

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/archival/libarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c
index 78366f26a..1f535b32a 100644
--- a/archival/libarchive/decompress_bunzip2.c
+++ b/archival/libarchive/decompress_bunzip2.c
@@ -235,9 +235,9 @@ static int get_next_block(bunzip_data *bd)
 		/* Get next value */
 		int n = 0;
 		while (get_bits(bd, 1)) {
+			n++;
 			if (n >= groupCount)
 				return RETVAL_DATA_ERROR;
-			n++;
 		}
 		/* Decode MTF to get the next selector */
 		tmp_byte = mtfSymbol[n];