Commit fa6c7012 authored by Cyril Brulebois's avatar Cyril Brulebois Committed by Keith Packard

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 (

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 <>
Signed-off-by: Cyril Brulebois's avatarCyril Brulebois <>
Reviewed-By: Matthias Hopf's avatarMatthias Hopf <>
Signed-off-by: Keith Packard's avatarKeith Packard <>
parent 10de9e8e
......@@ -609,7 +609,7 @@ xf86_reload_cursors (ScreenPtr screen)
cursor_screen_priv = dixLookupPrivate(&screen->devPrivates,
/* return if HW cursor is inactive, to avoid displaying two cursors */
if (!cursor_screen_priv->isUp)
if (!cursor_screen_priv || !cursor_screen_priv->isUp)
scrn = xf86Screens[screen->myNum];
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment