commit 576195524158aaf0952a9e0e48ed83249fc2784b
author Marco Nelissen <marcone@google.com> Fri May 12 18:25:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 12 18:25:58 2017 +0000
tree 54ad3570c9ae7bd78217f32bed443454c5fe4401
parent 22e0a7dce15b6080534c6567089050b662ef01ac
parent cef17a21f6bf19faba8a8829487850c40fcfc211

Check chunk size am: f01750adb0 am: 490b0166e5 am: 0931c97d8b am: e310bc6de1 am: 17c6385573 am: 7eaccb36d5 am: bea0a08ed7 am: 6a04069ea6 am: 271822a5ee am: f997858e13 am: fa83d8eb74
am: cef17a21f6

Change-Id: Ib01b4cb3c64b5f353c33a7789ec7be0cf9efc779

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

diff --git a/arm-wt-22k/lib_src/eas_mdls.c b/arm-wt-22k/lib_src/eas_mdls.c
index 296d783..8097ba4 100644
--- a/arm-wt-22k/lib_src/eas_mdls.c
+++ b/arm-wt-22k/lib_src/eas_mdls.c
@@ -785,6 +785,11 @@
     if ((result = EAS_HWGetDWord(pDLSData->hwInstData, pDLSData->fileHandle, pSize, EAS_FALSE)) != EAS_SUCCESS)
         return result;
 
+    if (*pSize < 0) {
+        ALOGE("b/37093318");
+        return EAS_ERROR_FILE_FORMAT;
+    }
+
     /* get form type for RIFF and LIST types */
     if ((*pChunkType == CHUNK_RIFF) || (*pChunkType == CHUNK_LIST))
     {