Module Name: xsrc
Committed By: snj
Date: Mon Sep 28 01:51:15 UTC 2009
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes [netbsd-5]:
xf86Cursors.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1031):
external/mit/xorg-server/dist/hw/xfree86/modes/xf86Cursors.c: revision
1.2
check that dixLookupPrivate() returned non-NULL before dereferencing
it. fixes a SEGV when starting ioquake3 on an X server started with
the "-dpi 100 -depth 16" flags, as reported by w...@.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Cursors.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/modes/xf86Cursors.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Cursors.c:1.1.1.1.2.1 xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Cursors.c:1.1.1.1.2.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Cursors.c:1.1.1.1.2.1 Thu Sep 17 03:35:12 2009
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Cursors.c Mon Sep 28 01:51:15 2009
@@ -612,7 +612,7 @@
cursor_screen_priv = dixLookupPrivate(&screen->devPrivates,
xf86CursorScreenKey);
/* return if HW cursor is inactive, to avoid displaying two cursors */
- if (!cursor_screen_priv->isUp)
+ if (!cursor_screen_priv || !cursor_screen_priv->isUp)
return;
scrn = xf86Screens[screen->myNum];
