diff options
| author | Marco Nelissen <marcone@google.com> | 2016-07-13 00:58:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-13 00:58:34 +0000 |
| commit | 571f65a3e8a23cf2420986c965c91a6762df706d (patch) | |
| tree | 87fce96a1a1fc3b17f887e9e26c98fdc64166e6f | |
| parent | 629255407ab28bef5e73f86113b3b76ffaa72c69 (diff) | |
| parent | 7881d834d2602676a149e87d49fd84714050faa0 (diff) | |
| download | android_external_sonivox-571f65a3e8a23cf2420986c965c91a6762df706d.tar.gz android_external_sonivox-571f65a3e8a23cf2420986c965c91a6762df706d.tar.bz2 android_external_sonivox-571f65a3e8a23cf2420986c965c91a6762df706d.zip | |
Fix NULL pointer dereference am: 6e988ba832 am: 3735317327 am: 490dd170bf am: c96ae6403c am: e26d11fd1f am: 9f57b2d447 am: 115c5d36b2
am: 7881d834d2
Change-Id: I0d9f23f8c750c98b90c9783b135a105ebb198f1e
| -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 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; |