mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 20:19:55 +00:00
Do not try to decode more data than output buffer may hold
Originally committed as revision 10560 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
8b505fc689
commit
4783cf0d09
@ -328,6 +328,11 @@ static int adx_decode_frame(AVCodecContext *avctx,
|
||||
rest -= hdrsize;
|
||||
}
|
||||
|
||||
/* 18 bytes of data are expanded into 32*2 bytes of audio,
|
||||
so guard against buffer overflows */
|
||||
if(rest/18 > *data_size/64)
|
||||
rest = (*data_size/64) * 18;
|
||||
|
||||
if (c->in_temp) {
|
||||
int copysize = 18*avctx->channels - c->in_temp;
|
||||
memcpy(c->dec_temp+c->in_temp,buf,copysize);
|
||||
|
Loading…
Reference in New Issue
Block a user