[FFmpeg-cvslog] r11249 - trunk/libavcodec/pcm.c

[benoit]

Author: benoit
Date: Mon Dec 17 11:41:47 2007
New Revision: 11249

Log:
Fix crash in PCM decoder when number of channels is not set.
Patch by "wg": video06 malloc de
See Issue298


Modified:
   trunk/libavcodec/pcm.c

Modified: trunk/libavcodec/pcm.c
==============================================================================
--- trunk/libavcodec/pcm.c	(original)
+++ trunk/libavcodec/pcm.c	Mon Dec 17 11:41:47 2007
@@ -384,10 +384,14 @@ static int pcm_decode_frame(AVCodecConte
     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;