diff options
| author | Marco Nelissen <marcone@google.com> | 2016-07-13 00:51:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-13 00:51:29 +0000 |
| commit | 115c5d36b2322d4291f3cc82682c4fc6b0a5601e (patch) | |
| tree | 7e8a6918e692cb649c0e53035d5cda032431bbac | |
| parent | 95a4f1d4af0118e9f7cdd8852b7445fb837aba57 (diff) | |
| parent | 9f57b2d44730c6006556b7ceb77f04cb2e2f5f95 (diff) | |
| download | android_external_sonivox-115c5d36b2322d4291f3cc82682c4fc6b0a5601e.tar.gz android_external_sonivox-115c5d36b2322d4291f3cc82682c4fc6b0a5601e.tar.bz2 android_external_sonivox-115c5d36b2322d4291f3cc82682c4fc6b0a5601e.zip | |
Fix NULL pointer dereference am: 6e988ba832 am: 3735317327 am: 490dd170bf am: c96ae6403c am: e26d11fd1f
am: 9f57b2d447
Change-Id: Ifb111a3a5555b42224b4859ee6ab11e89e49e46c
| -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; |