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

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  aac: check the maximum number of channels

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-28 13:45:29 +02:00
parent 65af5e815a a943a132f3
commit 5149407731
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/aacdec.c
View File

@ -148,6 +148,8 @@ static av_cold int che_configure(AACContext *ac,
enum ChannelPosition che_pos, enum ChannelPosition che_pos,
int type, int id, int *channels) int type, int id, int *channels)
{ {
if (*channels >= MAX_CHANNELS)
return AVERROR_INVALIDDATA;
if (che_pos) { if (che_pos) {
if (!ac->che[type][id]) { if (!ac->che[type][id]) {
if (!(ac->che[type][id] = av_mallocz(sizeof(ChannelElement)))) if (!(ac->che[type][id] = av_mallocz(sizeof(ChannelElement))))