summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-08-20 16:25:04 -0700
committerMichael Bestas <mikeioannina@gmail.com>2015-11-09 22:01:36 +0200
commitebe5523d273e578b4a175e29be22a703aae2c286 (patch)
tree1accaa0f26dfb0b7a6c3e9f01dcf30e1deb59b28
parent2be0130878bd8a3fb6a8168d913cb659db201086 (diff)
downloadandroid_external_sonivox-ebe5523d273e578b4a175e29be22a703aae2c286.tar.gz
android_external_sonivox-ebe5523d273e578b4a175e29be22a703aae2c286.tar.bz2
android_external_sonivox-ebe5523d273e578b4a175e29be22a703aae2c286.zip
Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.
Bug: 23335715 Change-Id: I4a5522c46dcda9285db1f830337aa2642ddc4fd1 (cherry picked from commit 99e0e2e2c1fd0f895b6d4bdf0a85798cf044218e)
-rw-r--r--arm-wt-22k/lib_src/eas_mdls.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arm-wt-22k/lib_src/eas_mdls.c b/arm-wt-22k/lib_src/eas_mdls.c
index 53d8882..2a10d12 100644
--- a/arm-wt-22k/lib_src/eas_mdls.c
+++ b/arm-wt-22k/lib_src/eas_mdls.c
@@ -1682,6 +1682,10 @@ static EAS_RESULT Parse_rgn (SDLS_SYNTHESIZER_DATA *pDLSData, EAS_I32 pos, EAS_I
/* parse wlnk chunk */
if ((result = Parse_wlnk(pDLSData, wlnkPos, &waveIndex)) != EAS_SUCCESS)
return result;
+ if (waveIndex >= pDLSData->waveCount)
+ {
+ return EAS_FAILURE;
+ }
pWsmp = &pDLSData->wsmpData[waveIndex];
/* if there is any articulation data, parse it */