diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2021-03-17 21:16:26 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-08 08:20:05 +0200 |
| commit | a14e1a59a4025cbb464b5deeed0f50d5a2898b0c (patch) | |
| tree | a77ca1ad742833343e7e34b107487101948ab4f8 | |
| parent | 1bd98ef7730f8f8807d07b3af0357e31a530e90a (diff) | |
| download | nx-libs-a14e1a59a4025cbb464b5deeed0f50d5a2898b0c.tar.gz nx-libs-a14e1a59a4025cbb464b5deeed0f50d5a2898b0c.tar.bz2 nx-libs-a14e1a59a4025cbb464b5deeed0f50d5a2898b0c.zip | |
randr: Do not update ConnectionInfo if NULL
Backport of this xorg-xserver commit:
commit 941aeb3b92e644923bd112eef8023f033a140ee6
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri May 13 08:58:58 2016 +0200
randr: Do not update ConnectionInfo if NULL
RRScreenSizeNotify() will update the connection information block, but
if this occurs during initialization before ConnectionInfo is even
initialized, this will lead to a crash.
Simply check for ConnectionInfo prior to update it to avoid the crash.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95337
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Fixes ArcticaProject/nx-libs#1009
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rrscreen.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/randr/rrscreen.c b/nx-X11/programs/Xserver/randr/rrscreen.c index 4f59e9aea..90371704a 100644 --- a/nx-X11/programs/Xserver/randr/rrscreen.c +++ b/nx-X11/programs/Xserver/randr/rrscreen.c @@ -66,6 +66,9 @@ RREditConnectionInfo(ScreenPtr pScreen) int screen = 0; int d; + if (ConnectionInfo == NULL) + return; + connSetup = (xConnSetup *) ConnectionInfo; vendor = (char *) connSetup + sizeof(xConnSetup); formats = (xPixmapFormat *) ((char *) vendor + |