Index: hw/xfree86/xaa/xaaImage.c
===================================================================
--- hw/xfree86/xaa/xaaImage.c.orig
+++ hw/xfree86/xaa/xaaImage.c
@@ -240,6 +240,7 @@ XAAWritePixmap(ScrnInfoPtr pScrn, int x,
     (*infoRec->SetupForImageWrite) (pScrn, rop, planemask, trans, bpp, depth);
     (*infoRec->SubsequentImageWriteRect) (pScrn, x, y, w, h, skipleft);
 
+#if 0
     if (beCareful) {
         /* in cases with bad alignment we have to be careful not
            to read beyond the end of the source */
@@ -248,6 +249,9 @@ XAAWritePixmap(ScrnInfoPtr pScrn, int x,
         else
             beCareful = FALSE;
     }
+#endif
+    if (beCareful)
+       h--;
 
     if (dwords > infoRec->ImageWriteRange) {
         while (h--) {