On Mar 01, 10 02:11:36 +0100, Cyril Brulebois wrote: > 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 <[email protected]> > Signed-off-by: Cyril Brulebois <[email protected]> > --- > hw/xfree86/modes/xf86Cursors.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > 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]; > -- > 1.7.0
Reviewed-By: Matthias Hopf <[email protected]> Matthias -- Matthias Hopf <[email protected]> __ __ __ Maxfeldstr. 5 / 90409 Nuernberg (_ | | (_ |__ [email protected] Phone +49-911-74053-715 __) |_| __) |__ R & D www.mshopf.de _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
