generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cook: check that category is smaller than 8

Browse Source 
This fixes some out of global array accesses of dither_tab.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Benjamin Larsson <benjamin@southpole.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-03-01 19:03:41 +01:00
parent e732d0f608
commit d629f3edaa
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/cook.c
View File

@@ -647,7 +647,7 @@ static int mono_decode(COOKContext *q, COOKSubpacket *p, float *mlt_buffer)
int category_index[128]; int category_index[128];
int quant_index_table[102]; int quant_index_table[102];
int category[128]; int category[128];
int ret; int ret, i;
memset(&category, 0, sizeof(category)); memset(&category, 0, sizeof(category));
memset(&category_index, 0, sizeof(category_index)); memset(&category_index, 0, sizeof(category_index));
@@ -657,6 +657,10 @@ static int mono_decode(COOKContext *q, COOKSubpacket *p, float *mlt_buffer)
q->num_vectors = get_bits(&q->gb, p->log2_numvector_size); q->num_vectors = get_bits(&q->gb, p->log2_numvector_size);
categorize(q, p, quant_index_table, category, category_index); categorize(q, p, quant_index_table, category, category_index);
expand_category(q, category, category_index); expand_category(q, category, category_index);
for (i=0; i<p->total_subbands; i++) {
if (category[i] > 7)
return AVERROR_INVALIDDATA;
}
decode_vectors(q, p, category, quant_index_table, mlt_buffer); decode_vectors(q, p, category, quant_index_table, mlt_buffer);
return 0; return 0;