ffmpeg | branch: release/3.1 | Vodyannikov Aleksandr <aleksoid1...@mail.ru> | Fri Jul 21 11:49:45 2017 +0200| [c6d9d0022093f2a8b5331b0d41e99429ccf3f02a] | committer: Michael Niedermayer
avcodec/cfhd: Fix decoding regression due to height check Fixes: Ticket6546 Regression since: 54aaadf648073149f1ac34f56cbde4e6c5aa22ef Reviewed-by: Muhammad Faiz <mfc...@gmail.com> Reviewed-by: Kieran Kunhya <kier...@obe.tv> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit 47c93657249f1a4bc8a7aaf2f9f3a33510bee38c) Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c6d9d0022093f2a8b5331b0d41e99429ccf3f02a --- libavcodec/cfhd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index 3dc768e516..e11ebf9ee2 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -332,7 +332,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, s->plane[s->channel_num].band[0][0].stride = data; } else if (tag == 28) { av_log(avctx, AV_LOG_DEBUG, "Lowpass height %"PRIu16"\n", data); - if (data < 3 || data > s->plane[s->channel_num].band[0][0].height) { + if (data < 3 || data > s->plane[s->channel_num].band[0][0].a_height) { av_log(avctx, AV_LOG_ERROR, "Invalid lowpass height\n"); ret = AVERROR(EINVAL); break; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
