Module Name: xsrc
Committed By: macallan
Date: Thu Dec 3 04:24:22 UTC 2009
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Bus.c
Log Message:
fix a segfault in xf86EnterServerState() which would fire whenever there is
more than one graphics device
This is a bandaid, we ( or the Xorg people ) need to fix it properly by
getting rid of all the now useless RAC-related code.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Bus.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/xorg-server/dist/hw/xfree86/common/xf86Bus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Bus.c:1.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Bus.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Bus.c:1.2 Fri Jun 12 01:53:24 2009
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Bus.c Thu Dec 3 04:24:22 2009
@@ -1517,8 +1517,11 @@
*/
if (!pEnt->access->pAccess
&& (pEnt->entityProp & (state == SETUP ? NEED_VGA_ROUTED_SETUP :
- NEED_VGA_ROUTED)))
- ((BusAccPtr)pEnt->busAcc)->set_f(pEnt->busAcc);
+ NEED_VGA_ROUTED))) {
+ if (pEnt->busAcc != NULL) {
+ ((BusAccPtr)pEnt->busAcc)->set_f(pEnt->busAcc);
+ }
+ }
}
