File GraphicsMagick-CVE-2016-5241.patch of Package GraphicsMagick.6323

# HG changeset patch
# User Bob Friesenhahn <bfriesen@GraphicsMagick.org>
# Date 1462131120 18000
# Node ID 8d175c4edfe7426c918717d7e2fd4781655ddfeb
# Parent  b2f1f3c86ce034b5e5aa75a819d889befa0bb5f2
DrawPolygonPrimitive(): Fix divide-by-zero problem if fill or stroke pattern image has zero columns or rows.

diff -r b2f1f3c86ce0 -r 8d175c4edfe7 magick/render.c
--- a/magick/render.c	Sun May 01 10:44:09 2016 -0500
+++ b/magick/render.c	Sun May 01 14:32:00 2016 -0500
@@ -3793,7 +3793,9 @@
 		      if (stroke_opacity < 0.99)
 			stroke_opacity=0.0;
 		    }
-		  if (fill_pattern != (Image *) NULL)
+		  if ((fill_pattern != (Image *) NULL) &&
+                      (fill_pattern->columns != 0) &&
+                      (fill_pattern->rows != 0))
 		    (void) AcquireOnePixelByReference
 		      (fill_pattern,&fill_color,
 		       (long) (x-fill_pattern->tile_info.x) % fill_pattern->columns,
@@ -3804,7 +3806,9 @@
 		  AlphaCompositePixel(q,&fill_color,fill_opacity,q,
 				      (q->opacity == TransparentOpacity)
 				      ? OpaqueOpacity : q->opacity);
-		  if (stroke_pattern != (Image *) NULL)
+		  if ((stroke_pattern != (Image *) NULL) &&
+                      (stroke_pattern->columns != 0) &&
+                      (stroke_pattern->rows != 0))
 		    (void) AcquireOnePixelByReference
 		      (stroke_pattern,&stroke_color,
 		       (long) (x-stroke_pattern->tile_info.x) % stroke_pattern->columns,

openSUSE Build Service is sponsored by