From 7b6517526631a65891b806bca30be8f49955d0a8 Mon Sep 17 00:00:00 2001
From: Michel Dänzer <daenzer@vmware.com>
Date: Wed, 14 Apr 2010 19:28:37 +0200
Subject: 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>
---
 exa/exa_accel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'exa')

diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index 4680c3709..57029fdc5 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -512,7 +512,7 @@ exaHWCopyNtoN (DrawablePtr    pSrcDrawable,
 	 *
 	 * Only taking this path for directly accessible pixmaps.
 	 */
-	} else if (!pDstExaPixmap->pDamage) {
+	} else if (!pDstExaPixmap->pDamage && pSrcExaPixmap->sys_ptr) {
 	    int bpp = pSrcDrawable->bitsPerPixel;
 	    int src_stride = exaGetPixmapPitch(pSrcPixmap);
 	    CARD8 *src = NULL;
-- 
cgit v1.2.3