mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfreerdp: fix crash with /monitor-list

Browse Source 
Catch the case when /monitor-list was used but the X display couldn't
be opened or wasn't available.
This commit is contained in:
Bernhard Miklautz 2015-01-15 21:38:52 +01:00
parent 5046b1d035
commit 5d4de15401
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/X11/xf_monitor.c
View File

@ -50,6 +50,11 @@ int xf_list_monitors(xfContext* xfc)
XineramaScreenInfo* screen = NULL;
display = XOpenDisplay(NULL);
if (!display)
{
WLog_ERR(TAG, "failed to open X display");
return -1;
}
if (XineramaQueryExtension(display, &ignored, &ignored2))
{
@ -76,6 +81,11 @@ int xf_list_monitors(xfContext* xfc)
display = XOpenDisplay(NULL);
if(!display)
{
WLog_ERR(TAG, "failed to open X display");
return -1;
}
screen = ScreenOfDisplay(display, DefaultScreen(display));
WLog_DBG(TAG, " * [0] %dx%d\t+%d+%d", WidthOfScreen(screen), HeightOfScreen(screen), 0, 0);
XCloseDisplay(display);