summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorVodyannikov Aleksandr <Aleksoid1978@mail.ru>2017-07-21 11:49:45 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-07-23 14:58:29 +0200
commit47c93657249f1a4bc8a7aaf2f9f3a33510bee38c (patch)
tree31df57fe2140ce8e26f2a4bb14d642a4aceacf5a /libavcodec
parentdd4b7badb416a5c2688da7310a7fe80fe4e4f209 (diff)
avcodec/cfhd: Fix decoding regression due to height check
Fixes: Ticket6546 Regression since: 54aaadf648073149f1ac34f56cbde4e6c5aa22ef Reviewed-by: Muhammad Faiz <mfcc64@gmail.com> Reviewed-by: Kieran Kunhya <kierank@obe.tv> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/cfhd.c2
1 files changed, 1 insertions, 1 deletions
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;