commit 70fb0610d2b27f1fdc4dc973da2d50b2c7a0d809
author Marco Nelissen <marcone@google.com> Fri Aug 21 08:54:54 2015 -0700
committer Feng Yu <feny@google.com> Wed Jul 20 21:16:13 2016 +0000
tree 87fce96a1a1fc3b17f887e9e26c98fdc64166e6f
parent 37ac87de8f33f730b0b8ee722a66cdd6a0c03b2e

Fix NULL pointer dereference

Bug: 29770686
Bug: 23304983
Change-Id: I1648aab90bc281702a00744bf884ae8bb8009412
(cherry picked from commit 6e988ba8325243acbf1a5b60d2ab2f36a9d61199)

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;