From 0e6a122316a94c96051f1d832990032a386097bc Mon Sep 17 00:00:00 2001 From: Roland Mainz Date: Mon, 13 Dec 2004 03:42:32 +0000 Subject: [PATCH] //bugs.freedesktop.org/show_bug.cgi?id=1695) attachment #1230 (https://bugs.freedesktop.org/attachment.cgi?id=1230): Fix crash in Xscreensaver code which allowed any authentificated X client to crash the Xserver using |XScreenSaverUnsetAttributes()|. Patch by ajax@nwnk.net --- Xext/saver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Xext/saver.c b/Xext/saver.c index bef86052a..76d044469 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.3 2004/10/10 17:48:43 herrb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.4 2004/11/01 16:05:27 eich Exp $ */ /* * $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $ * @@ -210,7 +210,7 @@ static int ScreenPrivateIndex; #define GetScreenPrivate(s) ((ScreenSaverScreenPrivatePtr)(s)->devPrivates[ScreenPrivateIndex].ptr) #define SetScreenPrivate(s,v) ((s)->devPrivates[ScreenPrivateIndex].ptr = (pointer) v); -#define SetupScreen(s) ScreenSaverScreenPrivatePtr pPriv = GetScreenPrivate(s) +#define SetupScreen(s) ScreenSaverScreenPrivatePtr pPriv = (s ? GetScreenPrivate(s) : NULL) #define New(t) ((t *) xalloc (sizeof (t)))