summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbhishek Arya <aarya@google.com>2015-08-21 13:52:26 (GMT)
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-21 13:52:26 (GMT)
commit3952328dcb3c2b8822b883dff1f46ce07d7fd736 (patch)
treed04d34a5940d9414e2a9fa68dc45ca04d78f9ab9
parent927e5b95d8f74e7758b416ecf6a706ca38001e60 (diff)
parent163e00f5e93f220140b789b0258441c343440bfa (diff)
downloadandroid_external_sonivox-3952328dcb3c2b8822b883dff1f46ce07d7fd736.zip
android_external_sonivox-3952328dcb3c2b8822b883dff1f46ce07d7fd736.tar.gz
android_external_sonivox-3952328dcb3c2b8822b883dff1f46ce07d7fd736.tar.bz2
Merge "Sonivox: fix overflow in Parse_data in eas_mdls.c" into mnc-dev
-rw-r--r--arm-wt-22k/lib_src/eas_mdls.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/arm-wt-22k/lib_src/eas_mdls.c b/arm-wt-22k/lib_src/eas_mdls.c
index d66c734..f260c05 100644
--- a/arm-wt-22k/lib_src/eas_mdls.c
+++ b/arm-wt-22k/lib_src/eas_mdls.c
@@ -139,6 +139,14 @@ extern double log10(double x);
#define DLS_MAX_INST_COUNT 256
#define MAX_DLS_WAVE_SIZE (1024*1024)
+#ifndef EAS_U32_MAX
+#define EAS_U32_MAX (4294967295U)
+#endif
+
+#ifndef EAS_I32_MAX
+#define EAS_I32_MAX (2147483647)
+#endif
+
/*------------------------------------
* typedefs
*------------------------------------
@@ -1126,6 +1134,14 @@ static EAS_RESULT Parse_wsmp (SDLS_SYNTHESIZER_DATA *pDLSData, EAS_I32 pos, S_WS
/* get loop length */
if ((result = EAS_HWGetDWord(pDLSData->hwInstData, pDLSData->fileHandle, &p->loopLength, EAS_FALSE)) != EAS_SUCCESS)
return result;
+
+ /* ensure no overflow */
+ if (p->loopLength
+ && ((p->loopStart > EAS_U32_MAX - p->loopLength)
+ || (p->loopStart + p->loopLength > EAS_U32_MAX / sizeof(EAS_SAMPLE))))
+ {
+ return EAS_FAILURE;
+ }
}
return EAS_SUCCESS;
@@ -1272,7 +1288,15 @@ static EAS_RESULT Parse_data (SDLS_SYNTHESIZER_DATA *pDLSData, EAS_I32 pos, EAS_
/* for looped samples, copy the last sample to the end */
if (pWsmp->loopLength)
+ {
+ if (pDLSData->wavePoolSize < sizeof(EAS_SAMPLE)
+ || (pWsmp->loopStart + pWsmp->loopLength) * sizeof(EAS_SAMPLE) > pDLSData->wavePoolSize - sizeof(EAS_SAMPLE))
+ {
+ return EAS_FAILURE;
+ }
+
pSample[pWsmp->loopStart + pWsmp->loopLength] = pSample[pWsmp->loopStart];
+ }
return EAS_SUCCESS;
}