[patch] proposed patch for cairo

0001-xcb-fix-handling-of-__cairo_clip_all.patch (text/plain), 1.12 KB, created by Alexandre Rostovtsev (RETIRED) on 2014-04-22 06:49:35 UTC

From 08c8e0f2413a8f6c60768b2adda2fdc0be218023 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <[e-mail]>
Date: Tue, 22 Apr 2014 02:37:54 -0400
Subject: [PATCH] xcb: fix handling of __cairo_clip_all

We don't want to modify the static all-clipped cairo_clip_t. Fixes
NULL pointer dereference in _clip_and_composite_boxes()
---
 src/cairo-xcb-surface-render.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/cairo-xcb-surface-render.c b/src/cairo-xcb-surface-render.c
index 9625953..14cef2d 100644
--- a/src/cairo-xcb-surface-render.c
+++ b/src/cairo-xcb-surface-render.c
@@ -3123,8 +3123,10 @@ _clip_and_composite_boxes (cairo_xcb_surface_t *dst,
 	clip = _cairo_clip_intersect_boxes (clip, boxes);
 	status = _cairo_clip_get_polygon (clip, &polygon,
 					  &fill_rule, &antialias);
-	_cairo_clip_path_destroy (clip->path);
-	clip->path = NULL;
+	if (! _cairo_clip_is_all_clipped (clip)) {
+	    _cairo_clip_path_destroy (clip->path);
+	    clip->path = NULL;
+	}
 	if (likely (status == CAIRO_INT_STATUS_SUCCESS)) {
 	    cairo_clip_t *saved_clip = extents->clip;
 	    extents->clip = clip;
-- 
1.9.2