[PATCH RESEND xserver] EXA: Check sys_ptr isn't NULL before passing it to the UploadToScreen hook.

[Alex Deucher]

2010/4/14 Michel Dänzer <michel at daenzer.net>:
> From: Michel Dänzer <daenzer at vmware.com>
>
> Fixes https://bugs.freedesktop.org/show_bug.cgi?id=27510 .
>
> Signed-off-by: Michel Dänzer <daenzer at vmware.com>

Reviewed-by: Alex Deucher <alexdeucher at gmail.com>

> ---
>  exa/exa_accel.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/exa/exa_accel.c b/exa/exa_accel.c
> index 4680c37..57029fd 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;
> --
> 1.7.0.4
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel