diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-07 01:33:44 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-07 01:33:44 +0000 |
commit | 859c341252c10b09a3852c4044c9e09ec9750365 (patch) | |
tree | 3e60362ea95e237a549541946d906951290774c0 | |
parent | cebc72dc00de84885922a6e25763eeba33a6eb18 (diff) | |
parent | 3f798575d2d39cd190797427d13471d6e7ceae4c (diff) | |
download | sonivox-android12-security-release.tar.gz |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26365428'] into security-aosp-sc-release.android-security-12.0.0_r60android-security-12.0.0_r59android12-security-release
Change-Id: Ic62e033b85f523a700c4dcabafbd8b572080cb97
-rw-r--r-- | arm-wt-22k/lib_src/eas_wtengine.c | 24 | ||||
-rw-r--r-- | arm-wt-22k/lib_src/eas_wtsynth.c | 12 |
2 files changed, 35 insertions, 1 deletions
diff --git a/arm-wt-22k/lib_src/eas_wtengine.c b/arm-wt-22k/lib_src/eas_wtengine.c index 950616e..9791fe8 100644 --- a/arm-wt-22k/lib_src/eas_wtengine.c +++ b/arm-wt-22k/lib_src/eas_wtengine.c @@ -99,6 +99,10 @@ void WT_VoiceGain (S_WT_VOICE *pWTVoice, S_WT_INT_FRAME *pWTIntFrame) ALOGE("b/26366256"); android_errorWriteLog(0x534e4554, "26366256"); return; + } else if (numSamples > BUFFER_SIZE_IN_MONO_SAMPLES) { + ALOGE("b/317780080 clip numSamples %ld -> %d", numSamples, BUFFER_SIZE_IN_MONO_SAMPLES); + android_errorWriteLog(0x534e4554, "317780080"); + numSamples = BUFFER_SIZE_IN_MONO_SAMPLES; } pMixBuffer = pWTIntFrame->pMixBuffer; pInputBuffer = pWTIntFrame->pAudioBuffer; @@ -196,6 +200,10 @@ void WT_Interpolate (S_WT_VOICE *pWTVoice, S_WT_INT_FRAME *pWTIntFrame) ALOGE("b/26366256"); android_errorWriteLog(0x534e4554, "26366256"); return; + } else if (numSamples > BUFFER_SIZE_IN_MONO_SAMPLES) { + ALOGE("b/317780080 clip numSamples %ld -> %d", numSamples, BUFFER_SIZE_IN_MONO_SAMPLES); + android_errorWriteLog(0x534e4554, "317780080"); + numSamples = BUFFER_SIZE_IN_MONO_SAMPLES; } pOutputBuffer = pWTIntFrame->pAudioBuffer; @@ -295,6 +303,10 @@ void WT_InterpolateNoLoop (S_WT_VOICE *pWTVoice, S_WT_INT_FRAME *pWTIntFrame) ALOGE("b/26366256"); android_errorWriteLog(0x534e4554, "26366256"); return; + } else if (numSamples > BUFFER_SIZE_IN_MONO_SAMPLES) { + ALOGE("b/317780080 clip numSamples %ld -> %d", numSamples, BUFFER_SIZE_IN_MONO_SAMPLES); + android_errorWriteLog(0x534e4554, "317780080"); + numSamples = BUFFER_SIZE_IN_MONO_SAMPLES; } pOutputBuffer = pWTIntFrame->pAudioBuffer; @@ -395,6 +407,10 @@ void WT_VoiceFilter (S_FILTER_CONTROL *pFilter, S_WT_INT_FRAME *pWTIntFrame) ALOGE("b/26366256"); android_errorWriteLog(0x534e4554, "26366256"); return; + } else if (numSamples > BUFFER_SIZE_IN_MONO_SAMPLES) { + ALOGE("b/317780080 clip numSamples %ld -> %d", numSamples, BUFFER_SIZE_IN_MONO_SAMPLES); + android_errorWriteLog(0x534e4554, "317780080"); + numSamples = BUFFER_SIZE_IN_MONO_SAMPLES; } pAudioBuffer = pWTIntFrame->pAudioBuffer; @@ -463,6 +479,10 @@ void WT_VoiceFilter (S_FILTER_CONTROL *pFilter, S_WT_INT_FRAME *pWTIntFrame) ALOGE("b/26366256"); android_errorWriteLog(0x534e4554, "26366256"); return; + } else if (numSamples > BUFFER_SIZE_IN_MONO_SAMPLES) { + ALOGE("b/317780080 clip numSamples %ld -> %d", numSamples, BUFFER_SIZE_IN_MONO_SAMPLES); + android_errorWriteLog(0x534e4554, "317780080"); + numSamples = BUFFER_SIZE_IN_MONO_SAMPLES; } pOutputBuffer = pWTIntFrame->pAudioBuffer; phaseInc = pWTIntFrame->frame.phaseIncrement; @@ -611,6 +631,10 @@ void WT_InterpolateMono (S_WT_VOICE *pWTVoice, S_WT_INT_FRAME *pWTIntFrame) ALOGE("b/26366256"); android_errorWriteLog(0x534e4554, "26366256"); return; + } else if (numSamples > BUFFER_SIZE_IN_MONO_SAMPLES) { + ALOGE("b/317780080 clip numSamples %ld -> %d", numSamples, BUFFER_SIZE_IN_MONO_SAMPLES); + android_errorWriteLog(0x534e4554, "317780080"); + numSamples = BUFFER_SIZE_IN_MONO_SAMPLES; } pMixBuffer = pWTIntFrame->pMixBuffer; diff --git a/arm-wt-22k/lib_src/eas_wtsynth.c b/arm-wt-22k/lib_src/eas_wtsynth.c index 74f78f5..ea1fe78 100644 --- a/arm-wt-22k/lib_src/eas_wtsynth.c +++ b/arm-wt-22k/lib_src/eas_wtsynth.c @@ -484,7 +484,12 @@ EAS_BOOL WT_CheckSampleEnd (S_WT_VOICE *pWTVoice, S_WT_INT_FRAME *pWTIntFrame, E /*lint -e{703} use shift for performance */ numSamples = (numSamples << NUM_PHASE_FRAC_BITS) - (EAS_I32) pWTVoice->phaseFrac; if (pWTIntFrame->frame.phaseIncrement) { - pWTIntFrame->numSamples = 1 + (numSamples / pWTIntFrame->frame.phaseIncrement); + EAS_I32 oldMethod = 1 + (numSamples / pWTIntFrame->frame.phaseIncrement); + pWTIntFrame->numSamples = + (numSamples + pWTIntFrame->frame.phaseIncrement - 1) / pWTIntFrame->frame.phaseIncrement; + if (oldMethod != pWTIntFrame->numSamples) { + ALOGE("b/317780080 old %ld new %ld", oldMethod, pWTIntFrame->numSamples); + } } else { pWTIntFrame->numSamples = numSamples; } @@ -492,6 +497,11 @@ EAS_BOOL WT_CheckSampleEnd (S_WT_VOICE *pWTVoice, S_WT_INT_FRAME *pWTIntFrame, E ALOGE("b/26366256"); android_errorWriteLog(0x534e4554, "26366256"); pWTIntFrame->numSamples = 0; + } else if (pWTIntFrame->numSamples > BUFFER_SIZE_IN_MONO_SAMPLES) { + ALOGE("b/317780080 clip numSamples %ld -> %d", + pWTIntFrame->numSamples, BUFFER_SIZE_IN_MONO_SAMPLES); + android_errorWriteLog(0x534e4554, "317780080"); + pWTIntFrame->numSamples = BUFFER_SIZE_IN_MONO_SAMPLES; } /* sound will be done this frame */ |