Attachment 5901 Details for Bug 4186 – Proposed fix.

[patch] Proposed fix.

0001-Bug-4186-Rework-cairo_surface_finish-to-not-miss-anything-due-to-early-return.txt (text/plain), 1.18 KB, created by Carl Worth on 2006-06-13 16:47:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Worth

Created: 2006-06-13 16:47:34 UTC

Size: 1.18 KB

patch

obsolete

>From nobody Mon Sep 17 00:00:00 2001
>From: Carl Worth <cworth@cworth.org>
>Date: Tue, 13 Jun 2006 16:43:38 -0700
>Subject: [PATCH] Bug 4186: Rework cairo_surface_finish to not miss anything due to early return.
>
>---
>
> src/cairo-surface.c |   18 ++++++------------
> 1 files changed, 6 insertions(+), 12 deletions(-)
>
>4f65dfaccc4e339d61c1e399cdc2bb24a0f93f42
>diff --git a/src/cairo-surface.c b/src/cairo-surface.c
>index 3218607..2b62ceb 100644
>--- a/src/cairo-surface.c
>+++ b/src/cairo-surface.c
>@@ -411,23 +411,17 @@ cairo_surface_finish (cairo_surface_t *s
> 	return;
>     }
> 
>-    if (surface->backend->finish == NULL) {
>-	surface->finished = TRUE;
>-	return;
>-    }
>-
>     if (!surface->status && surface->backend->flush) {
> 	status = surface->backend->flush (surface);
>-	if (status) {
>+	if (status)
> 	    _cairo_surface_set_error (surface, status);
>-	    return;
>-	}
>     }
> 
>-    status = surface->backend->finish (surface);
>-    if (status) {
>-	_cairo_surface_set_error (surface, status);
>-	return;
>+    if (surface->backend->finish) {
>+	status = surface->backend->finish (surface);
>+	if (status) {
>+	    _cairo_surface_set_error (surface, status);
>+	}
>     }
> 
>     surface->finished = TRUE;
>-- 
>1.3.2.g639c
>

Actions: View | Splinter Review

Attachments on bug 4186: 5901

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.