diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2010-04-22 14:16:59 +0200 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2010-04-22 14:16:59 +0200 |
| commit | 2c94da4e22520f4a3e783db06b73251131382868 (patch) | |
| tree | 3776a96e6190bc0cf5cd531f0ef4f61dfa5e8ef6 | |
| parent | 7815b02e8d9636b6abbe1f7cb555a1069db2d59f (diff) | |
EXA: Check sys_ptr isn't NULL before passing it to the UploadToScreen hook.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=27380 .
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)
| -rw-r--r-- | 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 4f94ae8bd..d4eae8960 100644 --- a/exa/exa_accel.c +++ b/exa/exa_accel.c @@ -505,7 +505,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; @@ -532,7 +532,8 @@ exaHWCopyNtoN (DrawablePtr pSrcDrawable, pbox++; } - } + } else + goto fallback; } else goto fallback; |