From: Cristy <urban-warrior@imagemagick.org>
Date: Fri, 24 Nov 2017 00:16:38 +0000 (-0500)
Subject: ...
X-Git-Tag: 7.0.7-12~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7500a918f8362099859f7a0ca3b1d88f116f1181;p=imagemagick

...
---

diff --git a/coders/psd.c b/coders/psd.c
index 5728efe70..a7baa8b7d 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -1263,9 +1263,7 @@ static MagickBooleanType ReadPSDChannelZip(Image *image,const size_t channels,
       while (stream.avail_out > 0)
       {
         ret=inflate(&stream,Z_SYNC_FLUSH);
-        if ((ret != Z_OK) && (ret != Z_STREAM_END))
-          break;
-        if (ret == Z_STREAM_END)
+        if (ret < 0)
           {
             (void) inflateEnd(&stream);
             compact_pixels=(unsigned char *) RelinquishMagickMemory(
@@ -1273,6 +1271,8 @@ static MagickBooleanType ReadPSDChannelZip(Image *image,const size_t channels,
             pixels=(unsigned char *) RelinquishMagickMemory(pixels);
             return(MagickFalse);
           }
+        if (ret == Z_STREAM_END)
+          break;
       }
       (void) inflateEnd(&stream);
     }