commit 6117f9294ebfd6efeb1da54ee35c583caaec0c6a
author android-build-team Robot <android-build-team-robot@google.com> Tue Oct 20 00:07:17 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Oct 20 00:07:17 2020 +0000
tree c4a463a495bb6d3d6445ce016ab2c61800d454c9
parent 5b45b1eb61677ec6ddc86fa1b7e0140167775bd2
parent 985ee50f8496233f9cadee15b5253df7f3de99ad

Snap for 6916203 from 985ee50f8496233f9cadee15b5253df7f3de99ad to mainline-release

Change-Id: Id156795fadb71966a874850349db780038e33929

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 876ce9b..fac6987 100644
--- a/arm-wt-22k/lib_src/eas_mdls.c
+++ b/arm-wt-22k/lib_src/eas_mdls.c
@@ -1372,6 +1372,10 @@
         {
             return EAS_SUCCESS;
         }
+        if (sampleLen < sizeof(EAS_SAMPLE)
+            || (pWsmp->loopStart + pWsmp->loopLength) * sizeof(EAS_SAMPLE) > sampleLen - sizeof(EAS_SAMPLE)) {
+            return EAS_FAILURE;
+        }
 
         pSample[(pWsmp->loopStart + pWsmp->loopLength)>>1] = pSample[(pWsmp->loopStart)>>1];
     }