From 2115c4a3ad751e887edae29bbf7002d6563fc631 Mon Sep 17 00:00:00 2001 From: Martin Herkt Date: Thu, 19 Sep 2013 20:08:34 +0200 Subject: vo/x11_common: Fail init with no valid XIM 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. --- video/out/x11_common.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'video') diff --git a/video/out/x11_common.c b/video/out/x11_common.c index 8c6ddae3ea..7c16e253a0 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -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); -- cgit v1.2.3