If we bail out of do_composite, make sure to undo any workarounds.

The workaround for an old X bug has to be undone if we bail from
do_composite, so we can't just return.

1 files changed, 2 insertions, 2 deletions

diff --git a/pixman/pixman.c b/pixman/pixman.c
index 56c9536..548242b 100644
--- a/pixman/pixman.c
+++ b/pixman/pixman.c
@@ -634,7 +634,7 @@ do_composite (pixman_implementation_t *imp,
 	    &region, src, mask, dest,
 	    src_x, src_y, mask_x, mask_y, dest_x, dest_y, width, height))
     {
-	return;
+	goto out;
     }
     
     extents = pixman_region32_extents (&region);
@@ -651,7 +651,7 @@ do_composite (pixman_implementation_t *imp,
      */
     op = optimize_operator (op, src_flags, mask_flags, dest_flags);
     if (op == PIXMAN_OP_DST)
-	return;
+	goto out;
 
     /* Check cache for fast paths */
     cache = PIXMAN_GET_THREAD_LOCAL (fast_path_cache);