diff options
| author | Marco Nelissen <marcone@google.com> | 2015-08-21 08:54:54 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-09-08 14:15:59 -0700 |
| commit | 3ad48b762a2d82facc3cf5c44d66894fab337be0 (patch) | |
| tree | a8324c9f6ad5369dbea7d397cb916fd1a4859b9c /arm-wt-22k/lib_src/eas_mdls.c | |
| parent | f3692bced672d78488d7753006d3e8e732fa0e42 (diff) | |
| download | android_external_sonivox-3ad48b762a2d82facc3cf5c44d66894fab337be0.tar.gz android_external_sonivox-3ad48b762a2d82facc3cf5c44d66894fab337be0.tar.bz2 android_external_sonivox-3ad48b762a2d82facc3cf5c44d66894fab337be0.zip | |
Fix NULL pointer dereferencestable/cm-13.0-ZNH2KB
CYNGNOS-3235
Bug: 29770686
Bug: 23304983
Change-Id: I1648aab90bc281702a00744bf884ae8bb8009412
(cherry picked from commit 6e988ba8325243acbf1a5b60d2ab2f36a9d61199)
(cherry picked from commit 523cd3170f4908935d3ef3a22c46d43cd8a39a8c)
Diffstat (limited to 'arm-wt-22k/lib_src/eas_mdls.c')
| -rw-r--r-- | arm-wt-22k/lib_src/eas_mdls.c | 6 |
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 a510b80..e1d7849 100644 --- a/arm-wt-22k/lib_src/eas_mdls.c +++ b/arm-wt-22k/lib_src/eas_mdls.c @@ -689,8 +689,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; |