# HG changeset patch # User benoit # Date 1197888107 0 # Node ID bd7600c7a06188e657163d404036e0188155b47e # Parent f74202e7e8966e3a614879fcb6dfd4fca6e9bdfe Fix crash in PCM decoder when number of channels is not set. Patch by "wg": video06 malloc de See Issue298 diff -r f74202e7e896 -r bd7600c7a061 pcm.c --- a/pcm.c Mon Dec 17 01:09:00 2007 +0000 +++ b/pcm.c Mon Dec 17 10:41:47 2007 +0000 @@ -384,10 +384,14 @@ 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;