summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-08-20 19:38:37 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-20 19:38:37 (GMT)
commit28a682e427b1ca365e1aec23321ed229cefeeb92 (patch)
treec714c2b3c1e895289610fba0898f297126e049eb
parentd216e303f65f5e36ffba92d342a8c61f753c98d7 (diff)
parent0a3e23a696b985a02d8f896f12a989e72c9b1cfe (diff)
downloadandroid_external_sonivox-28a682e427b1ca365e1aec23321ed229cefeeb92.zip
android_external_sonivox-28a682e427b1ca365e1aec23321ed229cefeeb92.tar.gz
android_external_sonivox-28a682e427b1ca365e1aec23321ed229cefeeb92.tar.bz2
am 0a3e23a6: am 5f5c79bd: am 8a9f53ee: Check segments and libs
* commit '0a3e23a696b985a02d8f896f12a989e72c9b1cfe': Check segments and libs
-rw-r--r--arm-wt-22k/lib_src/jet.c6
1 files changed, 6 insertions, 0 deletions
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 @@ static EAS_RESULT JetParseInfoChunk (EAS_DATA_HANDLE easHandle, EAS_I32 pos, EAS
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;