Attachment 42915 Details for Bug 33892 – 0001-Check-return-value-of-uxa_acquire_solid-since-it-can.patch

[patch] 0001-Check-return-value-of-uxa_acquire_solid-since-it-can.patch

0001-Check-return-value-of-uxa_acquire_solid-since-it-can.patch (text/plain), 1.56 KB, created by Bryce Harrington on 2011-02-04 00:18:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryce Harrington

Created: 2011-02-04 00:18:35 UTC

Size: 1.56 KB

patch

obsolete

>From fe183be88149cc120ad7dab314aaa691c5302232 Mon Sep 17 00:00:00 2001
>From: Bryce Harrington <bryce@canonical.com>
>Date: Fri, 4 Feb 2011 00:15:13 -0800
>Subject: [PATCH] Check return value of uxa_acquire_solid() since it can return NULL
>
>uxa_acquire_solid returns NULL under a variety of (valid) error
>conditions.  Thus the value of solid must be checked before
>dereferencing it in the uxa_get_offscreen() call.
>
>Signed-off-by: Bryce Harrington <bryce@canonical.com>
>---
> uxa/uxa-accel.c  |    8 ++++++++
> uxa/uxa-render.c |    2 ++
> 2 files changed, 10 insertions(+), 0 deletions(-)
>
>diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c
>index a5066c8..0650ac2 100644
>--- a/uxa/uxa-accel.c
>+++ b/uxa/uxa-accel.c
>@@ -120,6 +120,10 @@ uxa_fill_spans(DrawablePtr pDrawable, GCPtr pGC, int n,
> 
> 		solid = uxa_acquire_solid(screen, src->pSourcePict);
> 		FreePicture(src, 0);
>+		if (!solid) {
>+			FreePicture(dst, 0);
>+			goto solid;
>+		}
> 
> 		src = solid;
> 		src_pixmap = uxa_get_offscreen_pixmap(src->pDrawable,
>@@ -1110,6 +1114,10 @@ try_solid:
> 
> 			solid = uxa_acquire_solid(screen, src->pSourcePict);
> 			FreePicture(src, 0);
>+			if (!solid) {
>+				FreePicture(dst, 0);
>+				goto err;
>+			}
> 
> 			src = solid;
> 			src_pixmap = uxa_get_offscreen_pixmap(src->pDrawable,
>diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
>index 02bfa03..f41de2b 100644
>--- a/uxa/uxa-render.c
>+++ b/uxa/uxa-render.c
>@@ -1061,6 +1061,8 @@ try_solid:
> 			int src_off_x, src_off_y;
> 
> 			solid = uxa_acquire_solid(screen, src->pSourcePict);
>+			if (! solid)
>+				goto err_src;
> 			FreePicture(src, 0);
> 
> 			src = solid;
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 33892: 42915

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.