mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-08 10:56:05 +00:00
Fix crash in PCM decoder when number of channels is not set.
Patch by "wg": video06 malloc de See Issue298 Originally committed as revision 11249 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
fa13095a5d
commit
3426d575bf
@ -384,10 +384,14 @@ static int pcm_decode_frame(AVCodecContext *avctx,
|
||||
src = buf;
|
||||
|
||||
n= av_get_bits_per_sample(avctx->codec_id)/8;
|
||||
if((n && buf_size % n) || avctx->channels > MAX_CHANNELS){
|
||||
if(n && buf_size % n){
|
||||
av_log(avctx, AV_LOG_ERROR, "invalid PCM packet\n");
|
||||
return -1;
|
||||
}
|
||||
if(avctx->channels <= 0 || avctx->channels > MAX_CHANNELS){
|
||||
av_log(avctx, AV_LOG_ERROR, "PCM channels out of bounds\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
buf_size= FFMIN(buf_size, *data_size/2);
|
||||
*data_size=0;
|
||||
|
Loading…
Reference in New Issue
Block a user