summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2016-07-13 01:01:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-13 01:01:53 +0000
commite0a921ca5c2c97932c05a65d99ba8396957c5bc8 (patch)
tree87fce96a1a1fc3b17f887e9e26c98fdc64166e6f
parent629255407ab28bef5e73f86113b3b76ffaa72c69 (diff)
parent571f65a3e8a23cf2420986c965c91a6762df706d (diff)
downloadandroid_external_sonivox-e0a921ca5c2c97932c05a65d99ba8396957c5bc8.tar.gz
android_external_sonivox-e0a921ca5c2c97932c05a65d99ba8396957c5bc8.tar.bz2
android_external_sonivox-e0a921ca5c2c97932c05a65d99ba8396957c5bc8.zip
Fix NULL pointer dereference am: 6e988ba832 am: 3735317327 am: 490dd170bf am: c96ae6403c am: e26d11fd1f am: 9f57b2d447 am: 115c5d36b2 am: 7881d834d2
am: 571f65a3e8 Change-Id: I5cdef72e059c8a68a1bcd1d97222433220b8f2eb
-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;