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

ephyr: Avoid a segfault with 'DISPLAY= Xephy -glamor' 

ephyr_glamor_connect() returns NULL if we failed, but applying
xcb_connection_has_error() to NULL is not permitted.

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2015-02-04 17:04:45 +00:00
parent 0a78b599b3
commit f42520c5f1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/kdrive/ephyr/hostx.c
View File

@ -443,7 +443,7 @@ hostx_init(void)
else else
#endif #endif
HostX.conn = xcb_connect(NULL, &HostX.screen); HostX.conn = xcb_connect(NULL, &HostX.screen);
if (xcb_connection_has_error(HostX.conn)) { if (!HostX.conn || xcb_connection_has_error(HostX.conn)) {
fprintf(stderr, "\nXephyr cannot open host display. Is DISPLAY set?\n"); fprintf(stderr, "\nXephyr cannot open host display. Is DISPLAY set?\n");
exit(1); exit(1);
} }