2019-11-06 19:03:51 +08:00
|
|
|
From 52f520db6cda25f18e26208745f1b92803d5d559 Mon Sep 17 00:00:00 2001
|
2019-09-30 10:33:37 -04:00
|
|
|
From: Albert Astals Cid <aacid@kde.org>
|
|
|
|
|
Date: Tue, 28 May 2019 19:35:18 +0200
|
2019-11-06 19:03:51 +08:00
|
|
|
Subject: [PATCH 2/2] Make sure nSelectors is not out of range
|
2019-09-30 10:33:37 -04:00
|
|
|
|
|
|
|
|
nSelectors is used in a loop from 0 to nSelectors to access selectorMtf
|
|
|
|
|
which is
|
|
|
|
|
UChar selectorMtf[BZ_MAX_SELECTORS];
|
|
|
|
|
so if nSelectors is bigger than BZ_MAX_SELECTORS it'll do an invalid memory
|
|
|
|
|
access
|
|
|
|
|
|
|
|
|
|
Fixes out of bounds access discovered while fuzzying karchive
|
|
|
|
|
---
|
|
|
|
|
decompress.c | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/decompress.c b/decompress.c
|
2019-11-06 19:03:51 +08:00
|
|
|
index a1a0bac..e1fabdb 100644
|
2019-09-30 10:33:37 -04:00
|
|
|
--- a/decompress.c
|
|
|
|
|
+++ b/decompress.c
|
|
|
|
|
@@ -287,7 +287,7 @@ Int32 BZ2_decompress ( DState* s )
|
|
|
|
|
GET_BITS(BZ_X_SELECTOR_1, nGroups, 3);
|
2019-11-06 19:03:51 +08:00
|
|
|
if (nGroups < 2 || nGroups > BZ_N_GROUPS) RETURN(BZ_DATA_ERROR);
|
2019-09-30 10:33:37 -04:00
|
|
|
GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15);
|
|
|
|
|
- if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
|
|
|
|
|
+ if (nSelectors < 1 || nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR);
|
|
|
|
|
for (i = 0; i < nSelectors; i++) {
|
|
|
|
|
j = 0;
|
|
|
|
|
while (True) {
|
|
|
|
|
--
|
2019-11-06 19:03:51 +08:00
|
|
|
1.8.3.1
|
2019-09-30 10:33:37 -04:00
|
|
|
|
