commit 9f57b2d44730c6006556b7ceb77f04cb2e2f5f95
author Marco Nelissen <marcone@google.com> Wed Jul 13 00:48:18 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 13 00:48:18 2016 +0000
tree eb1169e98b670583d70591a8b2db6adc79aca0bc
parent f3f1da3028f61b7026c80a150cc40db52885ab8e
parent e26d11fd1f1fa55c77a6df69e73c9c8f238636de

Fix NULL pointer dereference am: 6e988ba832 am: 3735317327 am: 490dd170bf am: c96ae6403c
am: e26d11fd1f

Change-Id: I866a2d9ec2d0463a457a4c6d3795c65004c502ef

arm-wt-22k/lib_src/eas_mdls.c

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 @@
     }
 
     /* 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;