summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-08-21 15:54:54 (GMT)
committergitbuildkicker <android-build@google.com>2016-07-22 00:29:14 (GMT)
commitcadfb7a3c96d4fef06656cf37143e1b3e62cae86 (patch)
tree87fce96a1a1fc3b17f887e9e26c98fdc64166e6f
parent90f91b36a4ac48f1e131e24a85189f606707e20a (diff)
downloadandroid_external_sonivox-cadfb7a3c96d4fef06656cf37143e1b3e62cae86.zip
android_external_sonivox-cadfb7a3c96d4fef06656cf37143e1b3e62cae86.tar.gz
android_external_sonivox-cadfb7a3c96d4fef06656cf37143e1b3e62cae86.tar.bz2
Fix NULL pointer dereference
Bug: 29770686 Bug: 23304983 Change-Id: I1648aab90bc281702a00744bf884ae8bb8009412
-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 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;