From a15a92c2cbe0a8f45a1ff6258b22957c17c7118e Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 12 Dec 2016 14:18:15 +0000 Subject: [PATCH] Ensure we don't assert if GLX is not available Certain X server do not have GLX enabled or supported, such as x2go. We can handle this case gracefully inside libepoxy. Signed-off-by: Emmanuele Bassi --- src/dispatch_glx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/dispatch_glx.c b/src/dispatch_glx.c index 78e61c2..9e4cef6 100644 --- a/src/dispatch_glx.c +++ b/src/dispatch_glx.c @@ -57,11 +57,17 @@ epoxy_glx_version(Display *dpy, int screen) int ret; version_string = glXQueryServerString(dpy, screen, GLX_VERSION); + if (!version_string) + return 0; + ret = sscanf(version_string, "%d.%d", &server_major, &server_minor); assert(ret == 2); server = server_major * 10 + server_minor; version_string = glXGetClientString(dpy, GLX_VERSION); + if (!version_string) + return 0; + ret = sscanf(version_string, "%d.%d", &client_major, &client_minor); assert(ret == 2); client = client_major * 10 + client_minor;