[PATCH v2 xserver 2/2] ranrd: Do not update ConnectionInfo if NULL
Olivier Fourdan
ofourdan at redhat.com
Thu May 12 17:05:04 UTC 2016
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
Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
---
v2: Move test in RREditConnectionInfo()
randr/rrscreen.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index d0ca91e..66efef5 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -41,6 +41,9 @@ RREditConnectionInfo(ScreenPtr pScreen)
int screen = 0;
int d;
+ if (ConnectionInfo)
+ return;
+
connSetup = (xConnSetup *) ConnectionInfo;
vendor = (char *) connSetup + sizeof(xConnSetup);
formats = (xPixmapFormat *) ((char *) vendor +
--
2.7.4
More information about the xorg-devel
mailing list