Workaround EXA crash with new libcairo2 (#298)

2 files changed, 13 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 82049f6..04f0642 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-10  Bartosz Kosiorek  <gang65@poczta.onet.pl>
+
+	Workaround EXA crash with new libcairo2 (#298)
+
+	* src/via_accel.c: (viaExaPrepareComposite):
+
 2011-05-08  Bartosz Kosiorek  <gang65@poczta.onet.pl>
 
 	Fix cursor garbage after suspend/resume for Xserver 1.10 (#405)
diff --git a/src/via_accel.c b/src/via_accel.c
index df8cbc1..2cd77b3 100644
--- a/src/via_accel.c
+++ b/src/via_accel.c
@@ -2202,6 +2202,13 @@ viaExaPrepareComposite(int op, PicturePtr pSrcPicture,
     Bool isAGP;
     unsigned long offset;
 
+    /* Workaround: EXA crash with new libcairo2 on a VIA VX800 (#298) */
+    /* TODO Add real source only pictures */
+    if (!pSrc) { 
+ 	    ErrorF("pSrc is NULL\n"); 
+ 	    return FALSE; 
+ 	} 
+
     v3d->setDestination(v3d, exaGetPixmapOffset(pDst),
                         exaGetPixmapPitch(pDst), pDstPicture->format);
     v3d->setCompositeOperator(v3d, op);