diff mbox series

[FFmpeg-devel] tiff: remove tiff type check for ICC profiles

Message ID MGUiEcW--3-2@lynne.ee
State Accepted
Commit 7ad085b2c4d0ac27bc9e425fb81f012c74e5fbca
Headers show
Series [FFmpeg-devel] tiff: remove tiff type check for ICC profiles | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Lynne Sept. 5, 2020, 7:23 p.m. UTC 
Although the ICC specifications say to check for this, libtiff doesn't
and neither does any other TIFF implementation, and the TIFF specs
say that Photoshop has a different way to encapsulate ICC profiles,
and are asking for advice on how to deal with it.

So basically, photoshop puts a different type than what's specified,
no other implementation checks for this, we do because we tried to
follow the specs although its harmless to not, and ran into this bug
because we didn't know about it.

Patch attached.
Subject: [PATCH] tiff: remove tiff type check for ICC profiles

Although the ICC specifications say to check for this, libtiff doesn't
and neither does any other TIFF implementation, and the TIFF specs
say that Photoshop has a different way to encapsulate ICC profiles,
and are asking for advice on how to deal with it.

So basically, photoshop puts a different type than what's specified,
no other implementation checks for this, we do because we tried to
follow the specs although its harmless to not, and ran into this bug
because we didn't know about it.
---
 libavcodec/tiff.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Lynne Sept. 6, 2020, 7:13 p.m. UTC | #1 
Sep 5, 2020, 20:23 by dev@lynne.ee:

> Although the ICC specifications say to check for this, libtiff doesn't
> and neither does any other TIFF implementation, and the TIFF specs
> say that Photoshop has a different way to encapsulate ICC profiles,
> and are asking for advice on how to deal with it.
>
> So basically, photoshop puts a different type than what's specified,
> no other implementation checks for this, we do because we tried to
> follow the specs although its harmless to not, and ran into this bug
> because we didn't know about it.
>
> Patch attached.
>

Patch applied and bug closed.
diff mbox series

Patch

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 08dbca9d60..451784da84 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -1668,9 +1668,6 @@  static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
         }
         break;
     case TIFF_ICC_PROFILE:
-        if (type != TIFF_UNDEFINED)
-            return AVERROR_INVALIDDATA;
-
         gb_temp = s->gb;
         bytestream2_seek(&gb_temp, SEEK_SET, off);