From: Dirk Lemstra <dirk@git.imagemagick.org>
Date: Fri, 24 Nov 2017 08:54:27 +0000 (+0100)
Subject: Different fix for #869.
X-Git-Tag: 7.0.7-12~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73d59a74e0b0a864c1a9581b8a4bdbee427125e2;p=imagemagick

Different fix for #869.
---

diff --git a/coders/psd.c b/coders/psd.c
index a7baa8b7d..75ec20e50 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -1263,7 +1263,7 @@ static MagickBooleanType ReadPSDChannelZip(Image *image,const size_t channels,
       while (stream.avail_out > 0)
       {
         ret=inflate(&stream,Z_SYNC_FLUSH);
-        if (ret < 0)
+        if ((ret != Z_OK) && (ret != Z_STREAM_END))
           {
             (void) inflateEnd(&stream);
             compact_pixels=(unsigned char *) RelinquishMagickMemory(