commit ced96b13be0ba629eed4247893b5048195c2a7ab
author Marco Nelissen <marcone@google.com> Wed Aug 19 15:08:13 2015 -0700
committer The Android Automerger <android-build@android.com> Wed Sep 02 18:11:01 2015 -0700
tree d8e984645188f27b3d50b9aaf7b2eb88b1ed2ab7
parent c8444e6b08e267a8a3413e83415b3018b84cf82b

Check segments and libs

Bug: 23286323
Change-Id: I95ee385d0fb1503a4ce5a96e30d034ac8b81170e

arm-wt-22k/lib_src/jet.c

diff --git a/arm-wt-22k/lib_src/jet.c b/arm-wt-22k/lib_src/jet.c
index 97672cf..2f1541f 100644
--- a/arm-wt-22k/lib_src/jet.c
+++ b/arm-wt-22k/lib_src/jet.c
@@ -282,10 +282,16 @@
         switch (infoType)
         {
             case INFO_NUM_SMF_CHUNKS:
+                if (temp >= JET_MAX_SEGMENTS) {
+                    return EAS_ERROR_INCOMPATIBLE_VERSION;
+                }
                 easHandle->jetHandle->numSegments = (EAS_U8) temp;
                 break;
 
             case INFO_NUM_DLS_CHUNKS:
+                if (temp >= JET_MAX_DLS_COLLECTIONS) {
+                    return EAS_ERROR_INCOMPATIBLE_VERSION;
+                }
                 easHandle->jetHandle->numLibraries = (EAS_U8) temp;
                 break;