mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression use-after-free

Browse Source 
93d97dcb introduced a use-after-free error. The default_font for the
window manager may be used as the font for the main window manager
painter, and so deleting the default_font may cause the painter to
access deallocated memory.

At the point xrdp_wm_init() is called, the only active painter
should be the window manager one.
This commit is contained in:
matt335672 2022-11-23 11:02:21 +00:00
parent b0ab1c8529
commit 4c8997f033
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xrdp/xrdp_wm.c
View File

@ -574,8 +574,11 @@ xrdp_wm_init(struct xrdp_wm *self)
load_xrdp_config(self->xrdp_config, self->session->xrdp_ini, load_xrdp_config(self->xrdp_config, self->session->xrdp_ini,
self->screen->bpp); self->screen->bpp);
/* Load the font */ /* Remove a font loaded on the previous config */
xrdp_font_delete(self->default_font); xrdp_font_delete(self->default_font);
self->painter->font = NULL; /* May be set to the default_font */
/* Load the font */
dpi = xrdp_login_wnd_get_monitor_dpi(self); dpi = xrdp_login_wnd_get_monitor_dpi(self);
self->default_font = xrdp_font_create(self, dpi); self->default_font = xrdp_font_create(self, dpi);