mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check return value of XOpenDisplay().

Browse Source 
Instead of calling XGetXCBConnection() blindly, check XOpenDisplay()'s
return value to avoid a possible segfault in the former. That happens if
$DISPLAY is set, but if that display isn't available.

Signed-off-by: Cyril Brulebois <kibi@debian.org>
This commit is contained in:
Cyril Brulebois
2011-04-06 18:05:40 +02:00
committed by Kristian Høgsberg
parent 8d85e886fc
commit 20798291ca
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/compositor-x11.c
+4
View File
@@ -553,6 +553,10 @@ x11_compositor_create(struct wl_display *display, int width, int height)
memset(c, 0, sizeof *c); memset(c, 0, sizeof *c);
c->dpy = XOpenDisplay(NULL); c->dpy = XOpenDisplay(NULL);
if (c->dpy == NULL)
return NULL;
c->conn = XGetXCBConnection(c->dpy); c->conn = XGetXCBConnection(c->dpy);
if (xcb_connection_has_error(c->conn)) if (xcb_connection_has_error(c->conn))