From 872a373bc829b7eb6d94063023934b3713185d75 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 10 Oct 2017 18:50:13 +0100 Subject: [PATCH] egl/dri: don't crash when createImageFromRenderbuffer2 is NULL MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The __DRI_IMAGE version can be 17 or over, while the function pointer is NULL. Guard for that instead of crashing. Fixes: bad24395d91 ("egl/dri: use createImageFromRenderbuffer2 when available") Signed-off-by: Emil Velikov Reviewed-by: Eric Anholt Reviewed-by: Nicolai Hähnle --- src/egl/drivers/dri2/egl_dri2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 5334384d2f5..d5cdf32afa6 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -1890,7 +1890,8 @@ dri2_create_image_khr_renderbuffer(_EGLDisplay *disp, _EGLContext *ctx, return EGL_NO_IMAGE_KHR; } - if (dri2_dpy->image->base.version >= 17) { + if (dri2_dpy->image->base.version >= 17 && + dri2_dpy->image->createImageFromRenderbuffer2) { unsigned error = ~0; dri_image = dri2_dpy->image->createImageFromRenderbuffer2( -- 2.30.2