ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Wed Dec 7 12:06:16 2016 +0100| [c188f358aaee5800af5a5d699dd657cef3fb43a6] | committer: Michael Niedermayer
avcodec/wavpack: Treat the first block coding too many channels as an error Fixes memleak Fixes: 236/8aeebc9ca49b91bf71c114dcefac56c154a3a563 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c188f358aaee5800af5a5d699dd657cef3fb43a6 --- libavcodec/wavpack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 071e2be..2bd7783 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -1016,7 +1016,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no, if (wc->ch_offset + s->stereo >= avctx->channels) { av_log(avctx, AV_LOG_WARNING, "Too many channels coded in a packet.\n"); - return (avctx->err_recognition & AV_EF_EXPLODE) ? AVERROR_INVALIDDATA : 0; + return ((avctx->err_recognition & AV_EF_EXPLODE) || !wc->ch_offset) ? AVERROR_INVALIDDATA : 0; } samples_l = frame->extended_data[wc->ch_offset]; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
