From: Marek Olšák Date: Tue, 24 Apr 2018 04:00:20 +0000 (-0400) Subject: Revert "st/dri: Fix dangling pointer to a destroyed dri_drawable" X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4559aefb5cee5878198f8491680abe47df3e3250;p=mesa.git Revert "st/dri: Fix dangling pointer to a destroyed dri_drawable" This reverts commit dab02dea3411d325a5aee6cda5b581e61396ecc6. It causes crashes of qtcreator and firefox. Fixes: dab02de "st/dri: Fix dangling pointer to a destroyed dri_drawable" Cc: 18.0 18.1 --- diff --git a/src/gallium/state_trackers/dri/dri_drawable.c b/src/gallium/state_trackers/dri/dri_drawable.c index 02328acd98d..e5a7537e473 100644 --- a/src/gallium/state_trackers/dri/dri_drawable.c +++ b/src/gallium/state_trackers/dri/dri_drawable.c @@ -185,7 +185,6 @@ fail: void dri_destroy_buffer(__DRIdrawable * dPriv) { - struct dri_context *ctx = dri_context(dPriv->driContextPriv); struct dri_drawable *drawable = dri_drawable(dPriv); struct dri_screen *screen = drawable->screen; struct st_api *stapi = screen->st_api; @@ -203,9 +202,6 @@ dri_destroy_buffer(__DRIdrawable * dPriv) /* Notify the st manager that this drawable is no longer valid */ stapi->destroy_drawable(stapi, &drawable->base); - if (ctx && ctx->dPriv == dPriv) - ctx->dPriv = NULL; - FREE(drawable); }