frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Olivier Fourdan 2016-05-13 08:58:58 +02:00 committed by Adam Jackson
parent 6a6bbc3b75
commit 941aeb3b92
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
randr/rrscreen.c
View File

@ -41,6 +41,9 @@ RREditConnectionInfo(ScreenPtr pScreen)
int screen = 0; int screen = 0;
int d; int d;
if (ConnectionInfo == NULL)
return;
connSetup = (xConnSetup *) ConnectionInfo; connSetup = (xConnSetup *) ConnectionInfo;
vendor = (char *) connSetup + sizeof(xConnSetup); vendor = (char *) connSetup + sizeof(xConnSetup);
formats = (xPixmapFormat *) ((char *) vendor + formats = (xPixmapFormat *) ((char *) vendor +