[FFmpeg-devel] [PATCH] avcodec/cfhd: Fix decoding regression due to height check
Michael Niedermayer
michael at niedermayer.cc
Fri Jul 21 12:49:45 EEST 2017
From: Vodyannikov Aleksandr <Aleksoid1978 at mail.ru>
Fixes: Ticket6546
Regression since: 54aaadf648073149f1ac34f56cbde4e6c5aa22ef
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
libavcodec/cfhd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c
index f78bad9ae1..5ea8f24821 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;
--
2.13.0
More information about the ffmpeg-devel
mailing list