github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-08-04 14:59:58 +02:00
Code Releases Activity

vo/x11_common: Fail init with no valid XIM

Browse Source 
XOpenIM can fail to find a valid input method, in which case it
returns NULL. Passing a NULL pointer to XCreateIC would cause a
crash, so fail VO init before that happens.
This commit is contained in:
Martin Herkt 2013-09-19 20:08:34 +02:00
parent 858dcee5f1
commit 2115c4a3ad
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
video/out/x11_common.c
View File

@ -479,6 +479,15 @@ int vo_x11_init(struct vo *vo)
}
x11->xim = XOpenIM(x11->display, NULL, NULL, NULL);
if (!x11->xim) {
MP_MSG(x11, vo->probing ? MSGL_V : MSGL_ERR,
"vo: couldn't find a valid X input method!\n");
XCloseDisplay(x11->display);
talloc_free(x11);
vo->x11 = NULL;
return 0;
}
init_atoms(vo->x11);