virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/tiff: check the black level denominator

Browse Source 
Fixes ticket #8327.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2019-10-26 12:01:16 -03:00
parent ba6b20df3f
commit dad7592429
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/tiff.c
View File

@@ -1240,6 +1240,11 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
case TIFF_RATIONAL: case TIFF_RATIONAL:
value = ff_tget(&s->gb, TIFF_LONG, s->le); value = ff_tget(&s->gb, TIFF_LONG, s->le);
value2 = ff_tget(&s->gb, TIFF_LONG, s->le); value2 = ff_tget(&s->gb, TIFF_LONG, s->le);
if (!value2) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid denominator in rational\n");
return AVERROR_INVALIDDATA;
}
break; break;
case TIFF_STRING: case TIFF_STRING:
if (count <= 4) { if (count <= 4) {
@@ -1413,6 +1418,10 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
if (type == TIFF_RATIONAL) { if (type == TIFF_RATIONAL) {
value = ff_tget(&s->gb, TIFF_LONG, s->le); value = ff_tget(&s->gb, TIFF_LONG, s->le);
value2 = ff_tget(&s->gb, TIFF_LONG, s->le); value2 = ff_tget(&s->gb, TIFF_LONG, s->le);
if (!value2) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid black level denominator\n");
return AVERROR_INVALIDDATA;
}
s->black_level = value / value2; s->black_level = value / value2;
} else } else