Browse Source

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
tags/v0.5
wg Benoit Fouet 18 years ago
parent
commit
3426d575bf
1 changed files with 5 additions and 1 deletions
  1. +5
    -1
      libavcodec/pcm.c

+ 5
- 1
libavcodec/pcm.c View File

@@ -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…
Cancel
Save