Hi!
Attached patch fixes ticket 8884.
Please comment, Carl Eugen
From 0f7a5c6d2c739119ceb50fd8efd570807b8c7eb5 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffm...@gmail.com>
Date: Sat, 5 Sep 2020 19:22:54 +0200
Subject: [PATCH] lavc/tiff: Do not fail for an ICC profile with invalid type.
Fixes ticket #8884.
---
libavcodec/tiff.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 8a42e677ce..81e9a60bdf 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -1682,8 +1682,10 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
}
break;
case TIFF_ICC_PROFILE:
- if (type != TIFF_UNDEFINED)
- return AVERROR_INVALIDDATA;
+ if (type != TIFF_UNDEFINED) {
+ av_log(s->avctx, AV_LOG_WARNING, "Invalid ICC profile type %d\n", type);
+ break;
+ }
gb_temp = s->gb;
bytestream2_seek(&gb_temp, SEEK_SET, off);
--
2.24.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
