summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-08-21 15:54:54 (GMT)
committerJessica Wagantall <jwagantall@cyngn.com>2016-09-08 20:04:54 (GMT)
commit1dbcfaa8dc6c02836d77696a2c49567cf479d800 (patch)
treea8324c9f6ad5369dbea7d397cb916fd1a4859b9c
parentbba9df6bdd1563c930ef5bf0d97f52ce355fb4bb (diff)
downloadandroid_external_sonivox-stable/cm-13.0-ZNH5Y.zip
android_external_sonivox-stable/cm-13.0-ZNH5Y.tar.gz
android_external_sonivox-stable/cm-13.0-ZNH5Y.tar.bz2
Fix NULL pointer dereferencestable/cm-13.0-ZNH5Y
CYNGNOS-3235 Bug: 29770686 Bug: 23304983 Change-Id: I1648aab90bc281702a00744bf884ae8bb8009412 (cherry picked from commit 6e988ba8325243acbf1a5b60d2ab2f36a9d61199) (cherry picked from commit ffa83fc982cd1bff88e6e39f62ffe4c67ad776ee)
-rw-r--r--arm-wt-22k/lib_src/eas_mdls.c6
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 a510b80..e1d7849 100644
--- a/arm-wt-22k/lib_src/eas_mdls.c
+++ b/arm-wt-22k/lib_src/eas_mdls.c
@@ -689,8 +689,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;