summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/pcm.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
index 560e2e3884..c7a7e82477 100644
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@ -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;