fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-31 12:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: purge framebuffers with current context after unbinding winsys buffers

Browse source 
With commit c89e8470e5, framebuffers are purged after unbinding context,
but this change also introduces a heap corruption when running Rhino application
on VMware svga device. Instead of purging the framebuffers after the context
is unbound, this patch first ubinds the winsys buffers, then purges the framebuffers
with the current context, and then finally unbinds the context.

This fixes heap corruption.

Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Charmaine Lee 2019-05-18 18:32:13 -07:00
parent 7e5723d6d7
commit b480adfa5e
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/mesa/state_tracker/st_manager.c
View file

@ -1105,10 +1105,17 @@ st_api_make_current(struct st_api *stapi, struct st_context_iface *stctxi,
else {
GET_CURRENT_CONTEXT(ctx);
ret = _mesa_make_current(NULL, NULL, NULL);
if (ctx)
if (ctx) {
/* Before releasing the context, release its associated
* winsys buffers first. Then purge the context's winsys buffers list
* to free the resources of any winsys buffers that no longer have
* an existing drawable.
*/
ret = _mesa_make_current(ctx, NULL, NULL);
st_framebuffers_purge(ctx->st);
}
ret = _mesa_make_current(NULL, NULL, NULL);
}
return ret;