diff options
| author | Marco Nelissen <marcone@google.com> | 2015-08-21 08:54:54 -0700 |
|---|---|---|
| committer | SteadyQuad <SteadyQuad@gmail.com> | 2016-10-21 15:53:28 +0200 |
| commit | d6f4ce503010ef0753a6ba7515b5804af1dd2cdf (patch) | |
| tree | 887e4be1b4693ee5718910c4a20ca999ae245ecf | |
| parent | b926ffa7c112d53f0f3996ae2493798ad5ad0485 (diff) | |
| download | android_external_sonivox-d6f4ce503010ef0753a6ba7515b5804af1dd2cdf.tar.gz android_external_sonivox-d6f4ce503010ef0753a6ba7515b5804af1dd2cdf.tar.bz2 android_external_sonivox-d6f4ce503010ef0753a6ba7515b5804af1dd2cdf.zip | |
Fix NULL pointer dereference
Bug: 29770686
Bug: 23304983
Change-Id: I1648aab90bc281702a00744bf884ae8bb8009412
(cherry picked from commit 6e988ba8325243acbf1a5b60d2ab2f36a9d61199)
| -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; |