From 52e70819b4302d06dbfc3fd3dd655e79aefba7c8 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Tue, 29 Aug 2017 11:51:20 +0200 Subject: [PATCH] egl/dri2: only destroy created objects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit dri2_display_destroy may be called by dri2_initialize_wayland_drm() if initialization fails. In this case, these objects may not be initialized. Cc: mesa-stable@lists.freedesktop.org Signed-off-by: Michael Olbrich Reviewed-by: Tapani Pälli Reviewed-by: Emil Velikov (cherry picked from commit 81d5c31631840db704337489cf677cc596da79f5) [Andres Gomez: resolve trivial conflicts] Signed-off-by: Andres Gomez Conflicts: src/egl/drivers/dri2/egl_dri2.c --- src/egl/drivers/dri2/egl_dri2.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 9d91f4c8a29..62d9797ff1d 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -936,9 +936,12 @@ dri2_display_release(_EGLDisplay *disp) wl_drm_destroy(dri2_dpy->wl_drm); if (dri2_dpy->wl_shm) wl_shm_destroy(dri2_dpy->wl_shm); - wl_registry_destroy(dri2_dpy->wl_registry); - wl_event_queue_destroy(dri2_dpy->wl_queue); - wl_proxy_wrapper_destroy(dri2_dpy->wl_dpy_wrapper); + if (dri2_dpy->wl_registry) + wl_registry_destroy(dri2_dpy->wl_registry); + if (dri2_dpy->wl_queue) + wl_event_queue_destroy(dri2_dpy->wl_queue); + if (dri2_dpy->wl_dpy_wrapper) + wl_proxy_wrapper_destroy(dri2_dpy->wl_dpy_wrapper); if (dri2_dpy->own_device) { wl_display_disconnect(dri2_dpy->wl_dpy); }