RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ogg: Avoid the possibility to read out-of-bounds of a static global array in Vorbis 

decoding.

BUG=100543
Review URL: http://codereview.chromium.org/8365014
This fixes 25% of CVE-2011-3893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Chris Evans 2012-01-04 17:24:15 +01:00 committed by Michael Niedermayer
parent f35e037c93
commit 7149fce2ca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/vorbis.c
View File

@ -156,7 +156,7 @@ void ff_vorbis_ready_floor1_list(vorbis_floor1_entry * list, int values)
}
}
static inline void render_line_unrolled(intptr_t x, intptr_t y, int x1,
static inline void render_line_unrolled(intptr_t x, unsigned char y, int x1,
intptr_t sy, int ady, int adx,
float *buf)
{
@ -191,7 +191,7 @@ static void render_line(int x0, int y0, int x1, int y1, float *buf)
} else {
int base = dy / adx;
int x = x0;
int y = y0;
unsigned char y = y0;
int err = -adx;
ady -= FFABS(base) * adx;
while (++x < x1) {