highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash in PCM decoder when number of channels is not set.

Browse Source 
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:
wg 2007-12-17 10:41:47 +00:00 committed by Benoit Fouet
parent fa13095a5d
commit 3426d575bf
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/pcm.c
View File

@ -384,10 +384,14 @@ static int pcm_decode_frame(AVCodecContext *avctx,
src = buf; src = buf;
n= av_get_bits_per_sample(avctx->codec_id)/8; 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"); av_log(avctx, AV_LOG_ERROR, "invalid PCM packet\n");
return -1; 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); buf_size= FFMIN(buf_size, *data_size/2);
*data_size=0; *data_size=0;