zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fuzzer finds fixedpoint failure.

Browse Source 
A 32-bit number overflows. It's then capped to compute a 16-bit value.
This CL introduces a 64-bit variable on which equivalent operations are
performed instead.

Bug: chromium:864883
Change-Id: I371af869c6586256b900356491f467bed357e11d
Reviewed-on: https://webrtc-review.googlesource.com/89584
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Commit-Queue: Alex Loiko <aleloi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24041}
This commit is contained in:
Alex Loiko
2018-07-19 13:08:23 +02:00
committed by Commit Bot
parent 79eb4dd928
commit e714ed6427
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/audio_processing/agc/legacy/digital_agc.c
View File

@ -583,6 +583,7 @@ int16_t WebRtcAgc_ProcessVad(AgcVad* state, // (i) VAD state
int16_t buf2[4];
int16_t HPstate;
int16_t zeros, dB;
int64_t tmp64;
// process in 10 sub frames of 1 ms (to save on memory)
nrg = 0;
@ -688,17 +689,17 @@ int16_t WebRtcAgc_ProcessVad(AgcVad* state, // (i) VAD state
tmp32 = WebRtcSpl_DivW32W16(tmp32, state->stdLongTerm);
tmpU16 = (13 << 12);
tmp32b = WEBRTC_SPL_MUL_16_U16(state->logRatio, tmpU16);
tmp32 += tmp32b >> 10;
state->logRatio = (int16_t)(tmp32 >> 6);
tmp64 = tmp32;
tmp64 += tmp32b >> 10;
tmp64 >>= 6;
// limit
if (state->logRatio > 2048) {
state->logRatio = 2048;
}
if (state->logRatio < -2048) {
state->logRatio = -2048;
if (tmp64 > 2048) {
tmp64 = 2048;
} else if (tmp64 < -2048) {
tmp64 = -2048;
}
state->logRatio = (int16_t)tmp64;
return state->logRatio; // Q10
}