summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-08-21 00:29:16 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-21 00:29:16 (GMT)
commited1104cffb20d4b88a73c4fc348dcbdb8b48a105 (patch)
tree4e6575cdad73c9b799f2c2feaaeb0418729346e5
parent5f5c79bd8f6af0145c732e5b57a12e6f8ea8159a (diff)
parent8cbef48ba6e3d3f844b895f8ca1a1aee74414fff (diff)
downloadandroid_external_sonivox-ed1104cffb20d4b88a73c4fc348dcbdb8b48a105.zip
android_external_sonivox-ed1104cffb20d4b88a73c4fc348dcbdb8b48a105.tar.gz
android_external_sonivox-ed1104cffb20d4b88a73c4fc348dcbdb8b48a105.tar.bz2
am 8cbef48b: Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.
* commit '8cbef48ba6e3d3f844b895f8ca1a1aee74414fff': Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.
-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 */