diff options
| -rw-r--r-- | libavcodec/tiff.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index b43fda8c63..1456dad786 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -716,13 +716,13 @@ static int tiff_decode_tag(TiffContext *s) s->height = value; break; case TIFF_BPP: - s->bppcount = count; - if (count > 4) { + if (count > 4U) { av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%d, %d components)\n", - s->bpp, count); + value, count); return AVERROR_INVALIDDATA; } + s->bppcount = count; if (count == 1) s->bpp = value; else { @@ -743,6 +743,13 @@ static int tiff_decode_tag(TiffContext *s) s->bpp = -1; } } + if (s->bpp > 64U) { + av_log(s->avctx, AV_LOG_ERROR, + "This format is not supported (bpp=%d, %d components)\n", + s->bpp, count); + s->bpp = 0; + return AVERROR_INVALIDDATA; + } break; case TIFF_SAMPLES_PER_PIXEL: if (count != 1) { |