Browse Source

avcodec/aacdec_template: Check id_map

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>
tags/n2.8.5
Michael Niedermayer 10 years ago
parent
commit
e5567f2f69
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      libavcodec/aacdec_template.c

+ 4
- 0
libavcodec/aacdec_template.c View File

@@ -449,6 +449,10 @@ static int output_configure(AACContext *ac,
int type = layout_map[i][0];
int id = layout_map[i][1];
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
// channels in the order the PCE declared them.


Loading…
Cancel
Save