summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2016-07-13 00:48:18 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-13 00:48:18 +0000
commit9f57b2d44730c6006556b7ceb77f04cb2e2f5f95 (patch)
treeeb1169e98b670583d70591a8b2db6adc79aca0bc
parentf3f1da3028f61b7026c80a150cc40db52885ab8e (diff)
parente26d11fd1f1fa55c77a6df69e73c9c8f238636de (diff)
downloadandroid_external_sonivox-9f57b2d44730c6006556b7ceb77f04cb2e2f5f95.tar.gz
android_external_sonivox-9f57b2d44730c6006556b7ceb77f04cb2e2f5f95.tar.bz2
android_external_sonivox-9f57b2d44730c6006556b7ceb77f04cb2e2f5f95.zip
Fix NULL pointer dereference am: 6e988ba832 am: 3735317327 am: 490dd170bf am: c96ae6403c
am: e26d11fd1f Change-Id: I866a2d9ec2d0463a457a4c6d3795c65004c502ef
-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;