Module Name: xsrc
Committed By: tsutsui
Date: Wed Jun 6 15:19:54 UTC 2012
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i830_render.c
Log Message:
Pull the similar fix from i915_render.c rev 1.2 and i965_render.c rev 1.2:
http://mail-index.NetBSD.org/source-changes/2010/12/27/msg016345.html
> XXX: Fix crash with Firefox, where drawable is NULL.
> There must be a better fix for this.
http://mail-index.NetBSD.org/source-changes/2011/01/21/msg017560.html
> Avoid a crash when pDrawable is null.
Fixes Xserver SEGV on starting Firefox on old i830/855GM machines
running 6.0_BETA2.
Should be pulled up to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/i830_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/i830_render.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_render.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_render.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_render.c:1.1.1.2 Tue Jun 9 02:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_render.c Wed Jun 6 15:19:54 2012
@@ -212,6 +212,8 @@ static uint32_t i830_get_blend_cntl(int
static Bool i830_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;
