diff options
| author | Marco Nelissen <marcone@google.com> | 2015-08-21 08:54:54 -0700 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2016-08-16 15:51:44 -0700 |
| commit | cc623b71dfd0e986038ae65b2496d50b49bfb943 (patch) | |
| tree | 87fce96a1a1fc3b17f887e9e26c98fdc64166e6f | |
| parent | 90f91b36a4ac48f1e131e24a85189f606707e20a (diff) | |
| download | android_external_sonivox-cc623b71dfd0e986038ae65b2496d50b49bfb943.tar.gz android_external_sonivox-cc623b71dfd0e986038ae65b2496d50b49bfb943.tar.bz2 android_external_sonivox-cc623b71dfd0e986038ae65b2496d50b49bfb943.zip | |
Fix NULL pointer dereference
Bug: 29770686
Bug: 23304983
Change-Id: I1648aab90bc281702a00744bf884ae8bb8009412
| -rw-r--r-- | arm-wt-22k/lib_src/eas_mdls.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arm-wt-22k/lib_src/eas_mdls.c b/arm-wt-22k/lib_src/eas_mdls.c index b08e24e..e2cb688 100644 --- a/arm-wt-22k/lib_src/eas_mdls.c +++ b/arm-wt-22k/lib_src/eas_mdls.c @@ -683,8 +683,10 @@ EAS_RESULT DLSParser (EAS_HW_DATA_HANDLE hwInstData, EAS_FILE_HANDLE fileHandle, } /* create the default articulation */ - Convert_art(&dls, &defaultArt, 0); - dls.artCount = 1; + if (dls.pDLS) { + Convert_art(&dls, &defaultArt, 0); + dls.artCount = 1; + } /* parse the lins chunk and load instruments */ dls.regionCount = dls.instCount = 0; |