summaryrefslogtreecommitdiff
path: root/exa
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2010-04-14 19:28:37 +0200
committerKeith Packard <keithp@keithp.com>2010-04-14 17:10:07 -0700
commit7b6517526631a65891b806bca30be8f49955d0a8 (patch)
tree051be511a936eeed27773a224b4b96a6a9535a91 /exa
parentfc5d76740851725e3788c68e14474a012a205892 (diff)
EXA: Check sys_ptr isn't NULL before passing it to the UploadToScreen hook.
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>
Diffstat (limited to 'exa')
-rw-r--r--exa/exa_accel.c2
1 files changed, 1 insertions, 1 deletions
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;