RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-31 03:44:15 +00:00
Code Issues Projects Releases Wiki Activity

Proper subpacket size check for cook multichannel files.

Browse Source 
Originally committed as revision 18693 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Benjamin Larsson 2009-04-25 20:09:34 +00:00
parent bb1135c8a3
commit bdb8d99613
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/cook.c
View File

@ -72,7 +72,7 @@ typedef struct {
typedef struct {
int ch_idx;
unsigned int size;
int size;
int num_channels;
int cookversion;
int samples_per_frame;
@ -1011,6 +1011,10 @@ static int cook_decode_frame(AVCodecContext *avctx,
for(i=1;i<q->num_subpackets;i++){
q->subpacket[i].size = 2 * buf[avctx->block_align - q->num_subpackets + i];
q->subpacket[0].size -= q->subpacket[i].size + 1;
if (q->subpacket[0].size < 0) {
av_log(avctx,AV_LOG_DEBUG,"frame subpacket size total > avctx->block_align!\n");
return -1;
}
}
/* decode supbackets */