webrtc/modules/audio_coding/codecs/isac/main/source/entropy_coding.c - Issue 1734883003: iSAC entropy coder: Avoid signed integer overflow

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/audio_coding/codecs/isac/main/source/entropy_coding.c

Issue 1734883003: iSAC entropy coder: Avoid signed integer overflow (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c ('K') | « webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/codecs/isac/main/source/entropy_coding.c

diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/entropy_coding.c b/webrtc/modules/audio_coding/codecs/isac/main/source/entropy_coding.c

index dd1d64af7b86958496fcc28b42a1d63beb484841..c1204ad03adcbcae5175824818ee92f2c24e6928 100644

--- a/webrtc/modules/audio_coding/codecs/isac/main/source/entropy_coding.c

+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/entropy_coding.c

@@ -182,13 +182,13 @@ static void GenerateDitherQ7Lb(int16_t* bufQ7, uint32_t seed,

/* Fixed-point dither sample between -64 and 64 (Q7). */

/* dither = seed * 128 / 4294967295 */

- dither1_Q7 = (int16_t)(((int)seed + 16777216) >> 25);

+ dither1_Q7 = (int16_t)(((int32_t)(seed + 16777216)) >> 25);

/* New random unsigned int. */

seed = (seed * 196314165) + 907633515;

/* Fixed-point dither sample between -64 and 64. */

- dither2_Q7 = (int16_t)(((int)seed + 16777216) >> 25);

+ dither2_Q7 = (int16_t)(((int32_t)(seed + 16777216)) >> 25);

shft = (seed >> 25) & 15;

if (shft < 5) {

@@ -214,7 +214,7 @@ static void GenerateDitherQ7Lb(int16_t* bufQ7, uint32_t seed,

seed = (seed * 196314165) + 907633515;

/* Fixed-point dither sample between -64 and 64. */

- dither1_Q7 = (int16_t)(((int)seed + 16777216) >> 25);

+ dither1_Q7 = (int16_t)(((int32_t)(seed + 16777216)) >> 25);

/* Dither sample is placed in either even or odd index. */

shft = (seed >> 25) & 1; /* Either 0 or 1 */

@@ -254,7 +254,7 @@ static void GenerateDitherQ7LbUB(

/* Fixed-point dither sample between -64 and 64 (Q7). */

/* bufQ7 = seed * 128 / 4294967295 */

- bufQ7[k] = (int16_t)(((int)seed + 16777216) >> 25);

+ bufQ7[k] = (int16_t)(((int32_t)(seed + 16777216)) >> 25);

/* Scale by 0.35. */

bufQ7[k] = (int16_t)WEBRTC_SPL_MUL_16_16_RSFT(bufQ7[k], 2048, 13);