xserver: Branch 'server-1.7-nominations'
Julien Cristau
jcristau at kemper.freedesktop.org
Thu Jun 3 07:54:33 PDT 2010
hw/xfree86/modes/xf86Cursors.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f44ebbd3d52fa0dfdc51f6635721592b70affb6e
Author: Cyril Brulebois <kibi at debian.org>
Date: Mon Mar 1 02:11:36 2010 +0100
Fix null pointer dereference in xf86_reload_cursors().
Upon resume, X may try to dereference a null pointer, which has been
reported in Debian bug #507916 (http://bugs.debian.org/507916).
Jim Paris came up with a patch which solves the problem for him. Here's
a (hopefully) fixed version of his patch (without the typo).
Cc: Jim Paris <jim at jtan.com>
Signed-off-by: Cyril Brulebois <kibi at debian.org>
Reviewed-By: Matthias Hopf <mhopf at suse.de>
Signed-off-by: Keith Packard <keithp at keithp.com>
(cherry picked from commit fa6c7012572093a82c9389682977efff85590719)
diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
index 385848b..d6e747f 100644
--- a/hw/xfree86/modes/xf86Cursors.c
+++ b/hw/xfree86/modes/xf86Cursors.c
@@ -611,7 +611,7 @@ xf86_reload_cursors (ScreenPtr screen)
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];
More information about the xorg-commit
mailing list