aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmin Hassani <ahassani@chromium.org>2019-03-29 16:47:43 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-29 16:47:43 -0700
commitd1dc11d2ce9a4b6763f5434e0ed8fb57088a7fb4 (patch)
tree752e8abb4031b24d3656e3fec6469439d6c17671
parent88f685a100641a70175e0bae22e112212f16dfd8 (diff)
parent4dda28e9be640645a65915e04ba43817c36afcad (diff)
downloadbzip2-d1dc11d2ce9a4b6763f5434e0ed8fb57088a7fb4.tar.gz
Merge "Check for upper bounds of nselectors." am: d8e8ba4d7b am: 15d352377b
am: 4dda28e9be Change-Id: I11f45698fb69481a8b58016abc564a5dcb2dc092
-rw-r--r--decompress.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/decompress.c b/decompress.c
index 311f566..391552d 100644
--- a/decompress.c
+++ b/decompress.c
@@ -288,6 +288,7 @@ Int32 BZ2_decompress ( DState* s )
if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR);
GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15);
if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
+ if (nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR);
for (i = 0; i < nSelectors; i++) {
j = 0;
while (True) {