]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Fri, 24 Nov 2017 00:16:38 +0000 (19:16 -0500)
committerCristy <urban-warrior@imagemagick.org>
Fri, 24 Nov 2017 00:16:50 +0000 (19:16 -0500)
coders/psd.c

index 5728efe70f8a31f10e544ffc12fa5a4f64e7cc52..a7baa8b7d31525ef32ba5b6da6fc5a3975e8305d 100644 (file)
@@ -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);
     }