diff options
| author | Vodyannikov Aleksandr <Aleksoid1978@mail.ru> | 2017-07-21 11:49:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-07-23 15:00:52 +0200 |
| commit | 539dc1746a8b5b82dee8e802f2f724419a494fc5 (patch) | |
| tree | 4924a81847e1c89fee1e51c82e09154a4cfb48e9 | |
| parent | 97e35bc40be7f251857cb873849de4910c04cc20 (diff) | |
| download | ffmpeg-539dc1746a8b5b82dee8e802f2f724419a494fc5.tar.gz | |
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>
(cherry picked from commit 47c93657249f1a4bc8a7aaf2f9f3a33510bee38c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/cfhd.c | 2 |
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; |