Commit 744c419c authored by Emil Velikov's avatar Emil Velikov Committed by Emil Velikov

glamor: check for non NULL pixmap at 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: default avatarEmil Velikov <emil.velikov@collabora.com>
parent 7667180f
......@@ -927,7 +927,11 @@ glamor_close_screen(ScreenPtr screen)
ps->Glyphs = glamor_priv->saved_procs.glyphs;
screen_pixmap = screen->GetScreenPixmap(screen);
glamor_pixmap_destroy_fbo(screen_pixmap);
/* For DDX like Xwayland and Xorg, the pixmap is not destroyed so
* we should do so here.
*/
if (screen_pixmap)
glamor_pixmap_destroy_fbo(screen_pixmap);
glamor_release_screen_priv(screen);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment