aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-08 08:20:37 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-08 08:20:37 +0200
commitb73374805d06a1afbd49efb5cbf7a3be46217357 (patch)
treea77ca1ad742833343e7e34b107487101948ab4f8 /nx-X11
parent1bd98ef7730f8f8807d07b3af0357e31a530e90a (diff)
parenta14e1a59a4025cbb464b5deeed0f50d5a2898b0c (diff)
downloadnx-libs-b73374805d06a1afbd49efb5cbf7a3be46217357.tar.gz
nx-libs-b73374805d06a1afbd49efb5cbf7a3be46217357.tar.bz2
nx-libs-b73374805d06a1afbd49efb5cbf7a3be46217357.zip
Merge branch 'uli42-pr/fix_randr_crash' into 3.6.x
Attributes GH PR #1011: https://github.com/ArcticaProject/nx-libs/pull/1011
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/randr/rrscreen.c3
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 +