Attachment 35200 Details for Bug 27380 – Backported fix

[patch] Backported fix

0001-EXA-Check-sys_ptr-isn-t-NULL-before-passing-it-to-th.patch (text/plain), 1.35 KB, created by Michel Dänzer on 2010-04-21 01:58:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2010-04-21 01:58:01 UTC

Size: 1.35 KB

patch

obsolete

>From a153cc3d244ec187b2152b1c1737fcc3038675fd Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <daenzer@vmware.com>
>Date: Wed, 21 Apr 2010 10:46:16 +0200
>Subject: [PATCH] EXA: Check sys_ptr isn't NULL before passing it to the UploadToScreen hook.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Fixes https://bugs.freedesktop.org/show_bug.cgi?id=27510 .
>
>Signed-off-by: Michel DÃ¤nzer <daenzer@vmware.com>
>Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
>Signed-off-by: Keith Packard <keithp@keithp.com>
>(cherry picked from commit 7b6517526631a65891b806bca30be8f49955d0a8)
>---
> exa/exa_accel.c |    5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/exa/exa_accel.c b/exa/exa_accel.c
>index 7e2dd70..c20c9ac 100644
>--- a/exa/exa_accel.c
>+++ b/exa/exa_accel.c
>@@ -504,7 +504,7 @@ exaHWCopyNtoN (DrawablePtr    pSrcDrawable,
> 	    (*pExaScr->info->DoneCopy) (pDstPixmap);
> 	    exaMarkSync (pDstDrawable->pScreen);
> 	/* UTS: mainly for SHM PutImage's secondary path. */
>-	} else {
>+	} else if (pSrcExaPixmap->sys_ptr) {
> 	    int bpp = pSrcDrawable->bitsPerPixel;
> 	    int src_stride = exaGetPixmapPitch(pSrcPixmap);
> 	    CARD8 *src = NULL;
>@@ -531,7 +531,8 @@ exaHWCopyNtoN (DrawablePtr    pSrcDrawable,
> 
> 		pbox++;
> 	    }
>-	}
>+	} else
>+	    goto fallback;
>     } else
> 	goto fallback;
> 
>-- 
>1.7.0.4
>

Actions: View | Splinter Review

Attachments on bug 27380: 34552 | 34553 | 34554 | 34555 | 34556 | 34557 | 34558 | 34559 | 35173 | 35200

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.