andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

glamor_egl: check for non NULL pixmap at egl_close_screen 

DDX such as Xorg, Xwayland & Xephyr do not destroy the pixmap before
they call into CloseScreen. At the same time Xvfb (support for glamor
coming with later commit) do.

As such the pixmap will be NULL and we'll crash out.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Emil Velikov 2019-07-19 10:53:19 +01:00 committed by Emil Velikov
parent 15354fb68f
commit 7667180fb9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glamor/glamor_egl.c
View File

@ -770,8 +770,13 @@ glamor_egl_close_screen(ScreenPtr screen)
screen_pixmap = screen->GetScreenPixmap(screen);
pixmap_priv = glamor_get_pixmap_private(screen_pixmap);
eglDestroyImageKHR(glamor_egl->display, pixmap_priv->image);
pixmap_priv->image = NULL;
/* For DDX like Xwayland and Xorg, the pixmap is not destroyed so
* we should do so here.
*/
if (pixmap_priv) {
eglDestroyImageKHR(glamor_egl->display, pixmap_priv->image);
pixmap_priv->image = NULL;
}
screen->CloseScreen = glamor_egl->saved_close_screen;
glamor_egl_cleanup(screen);