summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHong Liu <hong.liu@intel.com>2008-04-17 10:57:34 +0800
committerZhenyu Wang <zhenyu.z.wang@intel.com>2008-04-17 10:59:03 +0800
commit5a1f7351c5bfa9f12cf718036ccc43f66787ce11 (patch)
tree2c44d213d0654223bbd0ff7ddc3c3ee842551512 /src
parent33ffd781bbca3d0dee8c1b47e7b90be5824b9a4f (diff)
fix possible segfault in I830FreeScreen
pI830 may point to NULL if I830PreInit fails (cherry picked from commit 0ae283582d21776d3317d5fc1c25751d50d562c7)
Diffstat (limited to 'src')
-rw-r--r--src/i830_driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 155e7a98..41c0578a 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3108,7 +3108,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]);