Module Name: xsrc
Committed By: christos
Date: Mon Dec 27 15:40:21 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i965_render.c
Log Message:
XXX: Fix crash with Firefox, where drawable is NULL.
There must be a better fix for this.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c:1.1.1.2 Mon Jun 8 22:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c Mon Dec 27 10:40:21 2010
@@ -183,6 +183,8 @@
static Bool i965_check_composite_texture(PicturePtr pPict, int unit)
{
+ if (pPict->pDrawable == NULL)
+ return FALSE;
ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
int w = pPict->pDrawable->width;
int h = pPict->pDrawable->height;
