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