diff options
| author | Wei Jia <wjia@google.com> | 2015-08-20 16:03:14 -0700 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2015-10-05 15:12:01 -0700 |
| commit | e2e4044fe9403b116cdbc9758c021e3fcb4fd133 (patch) | |
| tree | ce43937f7ff3e8e20320e19172ea3b3e3b22a68d /arm-wt-22k/lib_src | |
| parent | 64b9365180d732d7b10829db5bc6fcd2260005b3 (diff) | |
| download | android_external_sonivox-e2e4044fe9403b116cdbc9758c021e3fcb4fd133.tar.gz android_external_sonivox-e2e4044fe9403b116cdbc9758c021e3fcb4fd133.tar.bz2 android_external_sonivox-e2e4044fe9403b116cdbc9758c021e3fcb4fd133.zip | |
Sonivox: fix overflow in Parse_data in eas_mdls.c
Bug: 23307276
Change-Id: Iea56eae9a1855b41840f8d814717fe6379c5bb4d
Ticket: CYNGNOS-985
Diffstat (limited to 'arm-wt-22k/lib_src')
| -rw-r--r-- | arm-wt-22k/lib_src/eas_mdls.c | 24 |
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 2a10d12..3ebcde2 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 *------------------------------------ @@ -1132,6 +1140,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; @@ -1278,7 +1294,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; } |