drop clipped edges to the right

1 files changed, 17 insertions, 13 deletions

diff --git a/pixman/pixman-polygon.c b/pixman/pixman-polygon.c
index 2e077749..68c635fe 100644
--- a/pixman/pixman-polygon.c
+++ b/pixman/pixman-polygon.c
@@ -468,21 +468,25 @@ update_active (active_t *active)
 	    edge_t *edge;
 	    active_t *new;
 
-	    if (!(new = allocate_edge (active, &edge)))
+	    if (active->global_next->line.p1.x < active->x + active->width ||
+		active->global_next->line.p2.x < active->x + active->width)
 	    {
-		/* Out of memory. Simply skip to the
-		 * end of the global list. That way we
-		 * don't end up in an infinite loop
-		 * adding edges over and over.
-		 */
-		active->global_next = active->global_last;
-		goto oom_bail;
+		if (!(new = allocate_edge (active, &edge)))
+		{
+		    /* Out of memory. Simply skip to the
+		     * end of the global list. That way we
+		     * don't end up in an infinite loop
+		     * adding edges over and over.
+		     */
+		    active->global_next = active->global_last;
+		    goto oom_bail;
+		}
+		active = new;
+
+		edge_init (edge, active->global_next, active->x, active->yi);
+
+		list_append (active, edge);
 	    }
-	    active = new;
-
-	    edge_init (edge, active->global_next, active->x, active->yi);
-
-	    list_append (active, edge);
 	}
 
 	active->global_next++;