From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 2 Apr 2018 23:09:49 +0000 (-0400)
Subject: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7315
X-Git-Tag: 7.0.7-29~211
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b320fa9ded6335028e26c75509792b122b5b2ba;p=imagemagick

https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7315
---

diff --git a/coders/tiff.c b/coders/tiff.c
index 5799cbc69..9d15ec5e2 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -49,6 +49,7 @@
 #include "MagickCore/blob.h"
 #include "MagickCore/blob-private.h"
 #include "MagickCore/cache.h"
+#include "MagickCore/channel.h"
 #include "MagickCore/color.h"
 #include "MagickCore/color-private.h"
 #include "MagickCore/colormap.h"
@@ -1718,6 +1719,8 @@ RestoreMSCWarning
                   exception);
           }
       }
+    if (image->alpha_trait != UndefinedPixelTrait)
+      (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
     method=ReadGenericMethod;
     rows_per_strip=(uint32) image->rows;
     if (TIFFGetField(tiff,TIFFTAG_ROWSPERSTRIP,&rows_per_strip) == 1)