packets with half pcm samples are invalid

Originally committed as revision 7900 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 6 insertions, 0 deletions

diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
index 4011ed3b57..6cc4719a18 100644
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@ -410,6 +410,12 @@ static int pcm_decode_frame(AVCodecContext *avctx,
     samples = data;
     src = buf;
 
+    n= av_get_bits_per_sample(avctx->codec_id)/8;
+    if(n && buf_size % n){
+        av_log(avctx, AV_LOG_ERROR, "invalid PCM packet\n");
+        return -1;
+    }
+
     buf_size= FFMIN(buf_size, *data_size/2);
     *data_size=0;