diff options
| author | Wei Jia <wjia@google.com> | 2017-02-13 23:26:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-13 23:26:19 +0000 |
| commit | 0a55619575015850d1ce7a8363a9eb7861c41af4 (patch) | |
| tree | 153a936210851a952f2087894b7f64bf04db11cd | |
| parent | 776b9341e7c9ce7eec36df14b663f34a162c4f56 (diff) | |
| parent | 7b442b06c7b4b875921cb53d3951d554d02d8f3d (diff) | |
| download | android_external_sonivox-0a55619575015850d1ce7a8363a9eb7861c41af4.tar.gz android_external_sonivox-0a55619575015850d1ce7a8363a9eb7861c41af4.tar.bz2 android_external_sonivox-0a55619575015850d1ce7a8363a9eb7861c41af4.zip | |
Merge "eas_mdls: fix OOB read." into klp-dev am: 008d81708e am: c596af8816 am: ade762e1c4 am: 05b80e373b am: 944bffbd15 am: f5d1ed4a9c am: 41cdf3c775 am: 1efd33c341 am: 92a5d3f33b am: 984b949827 am: a9097aae1b am: 67c67f60db
am: 7b442b06c7
Change-Id: Ida43bbc8338732f57e408ead8c95934bde3b0291
| -rw-r--r-- | arm-wt-22k/lib_src/eas_mdls.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arm-wt-22k/lib_src/eas_mdls.c b/arm-wt-22k/lib_src/eas_mdls.c index e2cb688..296d783 100644 --- a/arm-wt-22k/lib_src/eas_mdls.c +++ b/arm-wt-22k/lib_src/eas_mdls.c @@ -114,6 +114,8 @@ /* this define allows us to use the sndlib.h structures as RW memory */ #define SCNST +#include "log/log.h" + #include "eas_data.h" #include "eas_host.h" #include "eas_mdls.h" @@ -2086,8 +2088,11 @@ static EAS_RESULT PushcdlStack (EAS_U32 *pStack, EAS_INT *pStackPtr, EAS_U32 val { /* stack overflow, return an error */ - if (*pStackPtr >= CDL_STACK_SIZE) + if (*pStackPtr >= (CDL_STACK_SIZE - 1)) { + ALOGE("b/34031018, stackPtr(%d)", *pStackPtr); + android_errorWriteLog(0x534e4554, "34031018"); return EAS_ERROR_FILE_FORMAT; + } /* push the value onto the stack */ *pStackPtr = *pStackPtr + 1; |