xserver: Branch 'server-1.7-nominations'

[Michel Dänzer]

 exa/exa_accel.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2c94da4e22520f4a3e783db06b73251131382868
Author: Michel Dänzer <daenzer at vmware.com>
Date:   Thu Apr 22 14:16:59 2010 +0200

    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 at vmware.com>
    Reviewed-by: Alex Deucher <alexdeucher at gmail.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit 7b6517526631a65891b806bca30be8f49955d0a8)

diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index 4f94ae8..d4eae89 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;