diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2004-12-13 03:34:33 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2004-12-13 03:34:33 +0000 |
| commit | b58c32d5420567585c43ce85ada610bdb4618759 (patch) | |
| tree | 51c3eb2345b413c58ae219f94d0d80cf24db7de2 | |
| parent | 828cdc528d58bcf891151e60a5dbd9e93da5a49d (diff) | |
//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
| -rw-r--r-- | Xext/saver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Xext/saver.c b/Xext/saver.c index dac1a94af..14e8322da 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.2.4.1 2004/12/13 01:16:24 gisburn 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))) |