]> granicus.if.org Git - imagemagick/commitdiff
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7308
authorCristy <urban-warrior@imagemagick.org>
Sat, 28 Apr 2018 17:24:51 +0000 (13:24 -0400)
committerCristy <urban-warrior@imagemagick.org>
Sat, 28 Apr 2018 17:24:51 +0000 (13:24 -0400)
coders/wpg.c

index 160e71785d84672e86341c3601b1bc1b4b4a6eb3..1ce5594014f2ff14b6ca00d5361d1d9bc33b682a 100644 (file)
@@ -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;
                   }
                 }