virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-05-16 08:38:24 +02:00
Code Issues Releases Activity

avcodec/aacdec_template: Check id_map

Browse Source 
Fixes index out of bounds error
Fixes: aac_index_out_of_bounds.wmv

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 590863876d)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-01-10 19:29:39 +01:00
parent b8382a1fae
commit e5567f2f69
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/aacdec_template.c
+4
View File
@@ -449,6 +449,10 @@ static int output_configure(AACContext *ac,
int type = layout_map[i][0]; int type = layout_map[i][0];
int id = layout_map[i][1]; int id = layout_map[i][1];
id_map[type][id] = type_counts[type]++; id_map[type][id] = type_counts[type]++;
if (id_map[type][id] >= MAX_ELEM_ID) {
avpriv_request_sample(ac->avctx, "Remapped id too large\n");
return AVERROR_PATCHWELCOME;
}
} }
// Try to sniff a reasonable channel order, otherwise output the // Try to sniff a reasonable channel order, otherwise output the
// channels in the order the PCE declared them. // channels in the order the PCE declared them.