diff options
| author | Marco Nelissen <marcone@google.com> | 2016-07-13 00:41:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-13 00:41:01 +0000 |
| commit | c96ae6403cd84e73138503fa6ee8f1356f639d61 (patch) | |
| tree | eb1169e98b670583d70591a8b2db6adc79aca0bc | |
| parent | f3f1da3028f61b7026c80a150cc40db52885ab8e (diff) | |
| parent | 490dd170bf8c2837b7a01f94d9e7ddced5acee91 (diff) | |
| download | android_external_sonivox-c96ae6403cd84e73138503fa6ee8f1356f639d61.tar.gz android_external_sonivox-c96ae6403cd84e73138503fa6ee8f1356f639d61.tar.bz2 android_external_sonivox-c96ae6403cd84e73138503fa6ee8f1356f639d61.zip | |
Fix NULL pointer dereference am: 6e988ba832 am: 3735317327
am: 490dd170bf
Change-Id: I942d45942a2742d61eb1cf7865215606c3f9798d
| -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; |