blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

render/egl: prevent use-after-free when destroying current surface

This commit is contained in:
Simon Ser 2019-10-22 23:43:15 +02:00 committed by Scott Anderson
parent fd25e2ca11
commit 51416738ea
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
render/egl.c
View File

@ -646,5 +646,12 @@ bool wlr_egl_destroy_surface(struct wlr_egl *egl, EGLSurface surface) {
if (!surface) { if (!surface) {
return true; return true;
} }
if (eglGetCurrentContext() == egl->context &&
eglGetCurrentSurface(EGL_DRAW) == surface) {
// Reset the current EGL surface in case it's the one we're destroying,
// otherwise the next wlr_egl_make_current call will result in a
// use-after-free.
wlr_egl_make_current(egl, NULL, NULL);
}
return eglDestroySurface(egl->display, surface); return eglDestroySurface(egl->display, surface);
} }