[cairo-commit] src/cairo-surface-clipper.c

[Chris Wilson]

 src/cairo-surface-clipper.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 29a302cc4bc7734129bca8fe242dc7ecb626895d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jul 29 12:57:31 2011 +0100

    clipper: Also need to guard against the incoming clip being NULL
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-surface-clipper.c b/src/cairo-surface-clipper.c
index e730300..bbc286b 100644
--- a/src/cairo-surface-clipper.c
+++ b/src/cairo-surface-clipper.c
@@ -133,7 +133,7 @@ _cairo_surface_clipper_set_clip (cairo_surface_clipper_t *clipper,
     assert (!_cairo_clip_is_all_clipped (clip));
 
     /* XXX Is this an incremental clip? */
-    if (clipper->clip &&
+    if (clipper->clip && clip &&
 	clip->num_boxes == clipper->clip->num_boxes &&
 	memcmp (clip->boxes, clipper->clip->boxes,
 		sizeof (cairo_box_t) * clip->num_boxes) == 0)