From d6dcf3b4ca7053e9c49780a398c3baabd884ff2c Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 18 Aug 2016 16:43:36 +0100 Subject: [PATCH] egl/dri2: bail out on NULL dpy in dri2_display_release() Currently all callers are careful enough not to do that, yet that will not be the case in the future. Signed-off-by: Emil Velikov Reviewed-by: Eric Engestrom --- src/egl/drivers/dri2/egl_dri2.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index dacdfbd74f5..f2ed3c7d3a2 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -851,9 +851,14 @@ dri2_initialize(_EGLDriver *drv, _EGLDisplay *disp) static void dri2_display_release(_EGLDisplay *disp) { - struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); + struct dri2_egl_display *dri2_dpy; unsigned i; + if (!disp) + return; + + dri2_dpy = dri2_egl_display(disp); + assert(dri2_dpy->ref_count > 0); dri2_dpy->ref_count--; -- 2.30.2