commit f998b55aad779936f36c230d86a61fd109d68e0b
author Bill Rassieur <rassb@google.com> Tue Apr 02 18:29:17 2019 +0000
committer Bill Rassieur <rassb@google.com> Tue Apr 02 18:29:17 2019 +0000
tree 752e8abb4031b24d3656e3fec6469439d6c17671
parent 88f685a100641a70175e0bae22e112212f16dfd8
parent d1dc11d2ce9a4b6763f5434e0ed8fb57088a7fb4

Merge master@5428150 into git_qt-dev-plus-aosp.

Change-Id: I422285de38de7d3500774e25efc69b46cc4d3cca
BUG: 129345239

decompress.c

diff --git a/decompress.c b/decompress.c
index 311f566..391552d 100644
--- a/decompress.c
+++ b/decompress.c
@@ -288,6 +288,7 @@
       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) {