xf86-video-intel: src/i830_driver.c

Zhenyu Wang zhen at kemper.freedesktop.org
Wed Apr 16 20:00:49 PDT 2008


 src/i830_driver.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0ae283582d21776d3317d5fc1c25751d50d562c7
Author: Hong Liu <hong.liu at intel.com>
Date:   Thu Apr 17 10:57:34 2008 +0800

    fix possible segfault in I830FreeScreen
    
    pI830 may point to NULL if I830PreInit fails

diff --git a/src/i830_driver.c b/src/i830_driver.c
index ea37e6d..dd3e235 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3112,7 +3112,7 @@ I830FreeScreen(int scrnIndex, int flags)
 #ifdef INTEL_XVMC
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     I830Ptr pI830 = I830PTR(pScrn);
-    if (pI830->XvMCEnabled)
+    if (pI830 && pI830->XvMCEnabled)
 	intel_xvmc_finish(xf86Screens[scrnIndex]);
 #endif
    I830FreeRec(xf86Screens[scrnIndex]);


More information about the xorg-commit mailing list