summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-08-20 23:25:04 (GMT)
committerWei Jia <wjia@google.com>2015-08-20 23:53:06 (GMT)
commit8cbef48ba6e3d3f844b895f8ca1a1aee74414fff (patch)
tree5845148f48103aca2f8da7e7ead79901f7e109e9
parent8a9f53ee2c661e8b5b94d6e9fbb8af3baa34310d (diff)
downloadandroid_external_sonivox-8cbef48ba6e3d3f844b895f8ca1a1aee74414fff.zip
android_external_sonivox-8cbef48ba6e3d3f844b895f8ca1a1aee74414fff.tar.gz
android_external_sonivox-8cbef48ba6e3d3f844b895f8ca1a1aee74414fff.tar.bz2
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 51cce70..d66c734 100644
--- a/arm-wt-22k/lib_src/eas_mdls.c
+++ b/arm-wt-22k/lib_src/eas_mdls.c
@@ -1676,6 +1676,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 */