diff options
author | Wei Jia <wjia@google.com> | 2015-08-20 16:25:04 -0700 |
---|---|---|
committer | The Android Automerger <android-build@android.com> | 2015-09-01 19:08:13 -0700 |
commit | e31121037956a03600d3693f973a3ca111a60c69 (patch) | |
tree | 4e6575cdad73c9b799f2c2feaaeb0418729346e5 | |
parent | d18e7fb1f23c3a74bb188e2895a3ae85a84c04fd (diff) | |
download | android_external_sonivox-e31121037956a03600d3693f973a3ca111a60c69.tar.gz android_external_sonivox-e31121037956a03600d3693f973a3ca111a60c69.tar.bz2 android_external_sonivox-e31121037956a03600d3693f973a3ca111a60c69.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.c | 4 |
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 */ |