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-12 21:00:23 (GMT)
commite2d67a97c9cf18ddbcae3b26dc81d477f7a7dc90 (patch)
tree303330adb411866043aea68f71aacec992bf77f2
parentd0140616c0aaa411ffd2c162765dffe722fc92c6 (diff)
downloadandroid_external_sonivox-cm-12.1.zip
android_external_sonivox-cm-12.1.tar.gz
android_external_sonivox-cm-12.1.tar.bz2
Fix NULL pointer dereferencecm-12.1
CYNGNOS-3235 Bug: 29770686 Bug: 23304983 Change-Id: I1648aab90bc281702a00744bf884ae8bb8009412 (cherry picked from commit 6e988ba8325243acbf1a5b60d2ab2f36a9d61199)
-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;