From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 28 Apr 2018 17:24:51 +0000 (-0400)
Subject: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7308
X-Git-Tag: 7.0.7-29~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c10d97ba7b3bb6d7c9f56fbda6f0a6d6f6218c05;p=imagemagick

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

diff --git a/coders/wpg.c b/coders/wpg.c
index 160e71785..1ce559401 100644
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -1405,6 +1405,8 @@ static Image *ReadWPGImage(const ImageInfo *image_info,
                 }
               image->columns=Bitmap2Header1.Width;
               image->rows=Bitmap2Header1.Height;
+              if (image_info->ping != MagickFalse)
+                return(image);
               status=SetImageExtent(image,image->columns,image->rows,exception);
               if (status == MagickFalse)
                 break;
@@ -1452,9 +1454,8 @@ static Image *ReadWPGImage(const ImageInfo *image_info,
                   }
                 case 1:    /*RLE for WPG2 */
                   {
-                    if(!image_info->ping)
-                      if( UnpackWPG2Raster(image,bpp,exception) < 0)
-                        goto DecompressionFailed;
+                    if( UnpackWPG2Raster(image,bpp,exception) < 0)
+                      goto DecompressionFailed;
                     break;
                   }
                 }