Patch fix-imagefill-for-images-smaller-than-4px-width for GD related Bug #60160

Patch version 2011-10-31 14:51 UTC

• 2011-10-31 14:51 UTC [diff to current]

Developer: fa@php.net

Index: ext/gd/libgd/gd.c
===================================================================
--- ext/gd/libgd/gd.c	(revision 318603)
+++ ext/gd/libgd/gd.c	(working copy)
@@ -1894,19 +1894,14 @@
 	if (im->sx < 4) {
 		int ix = x, iy = y, c;
 		do {
-			c = gdImageGetPixel(im, ix, iy);
-			if (c != oc) {
-				goto done;
-			}
-			gdImageSetPixel(im, ix, iy, nc);
-		} while(ix++ < (im->sx -1));
-		ix = x; iy = y + 1;
-		do {
-			c = gdImageGetPixel(im, ix, iy);
-			if (c != oc) {
-				goto done;
-			}
-			gdImageSetPixel(im, ix, iy, nc);
+			do {
+				c = gdImageGetPixel(im, ix, iy);
+				if (c != oc) {
+					goto done;
+				}
+				gdImageSetPixel(im, ix, iy, nc);
+			} while(ix++ < (im->sx -1));
+			ix = x;
 		} while(iy++ < (im->sy -1));
 		goto done;
 	}