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

iLBC decoding: Ignore a signed overflow

Browse Source 
It's always been there, and there's no security risk.

Bug: chromium:843477
Change-Id: I6121943f23b477300cf60ffc4858ef0ab43466dc
Reviewed-on: https://webrtc-review.googlesource.com/78782
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23393}
This commit is contained in:
Karl Wiberg
2018-05-24 15:14:07 +02:00
committed by Commit Bot
parent 1d4a2279af
commit e058568cc5
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/audio_coding/codecs/ilbc/smooth_out_data.c
View File

@ -18,6 +18,16 @@
#include "modules/audio_coding/codecs/ilbc/defines.h"
#include "modules/audio_coding/codecs/ilbc/constants.h"
#include "rtc_base/sanitizer.h"
// An s32 + s32 -> s32 addition that's allowed to overflow. (It's still
// undefined behavior, so not a good idea; this just makes UBSan ignore the
// violation, so that our old code can continue to do what it's always been
// doing.)
static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow")
OverflowingAdd_S32_S32_To_S32(int32_t a, int32_t b) {
return a + b;
}
int32_t WebRtcIlbcfix_Smooth_odata(
int16_t *odata,
@ -37,7 +47,7 @@ int32_t WebRtcIlbcfix_Smooth_odata(
errs=0;
for(i=0;i<80;i++) {
err = (psseq[i] - odata[i]) >> 3;
errs += err * err; /* errs in Q-6 */
errs = OverflowingAdd_S32_S32_To_S32(errs, err * err); // errs in Q-6
}
return errs;