You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-10 06:10:52 +02:00
avcodec/tiff: do not abort on zero denominator
Fixes decoding valid DNG file.
This commit is contained in:
@@ -1241,8 +1241,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
|
|||||||
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) {
|
if (!value2) {
|
||||||
av_log(s->avctx, AV_LOG_ERROR, "Invalid denominator in rational\n");
|
av_log(s->avctx, AV_LOG_WARNING, "Invalid denominator in rational\n");
|
||||||
return AVERROR_INVALIDDATA;
|
value2 = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
@@ -1421,8 +1421,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
|
|||||||
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) {
|
if (!value2) {
|
||||||
av_log(s->avctx, AV_LOG_ERROR, "Invalid black level denominator\n");
|
av_log(s->avctx, AV_LOG_WARNING, "Invalid black level denominator\n");
|
||||||
return AVERROR_INVALIDDATA;
|
value2 = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
s->black_level = value / value2;
|
s->black_level = value / value2;
|
||||||
|
Reference in New Issue
Block a user