Module Name: xsrc
Committed By: ahoka
Date: Fri Jan 21 09:46:19 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i915_render.c
Log Message:
Avoid a crash when pDrawable is null.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/i915_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/i915_render.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i915_render.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i915_render.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/i915_render.c:1.1.1.2 Tue Jun 9 02:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/i915_render.c Fri Jan 21 09:46:19 2011
@@ -169,6 +169,9 @@
static Bool i915_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;
