Merge pull request #2437 from matt335672/fix_font_use_after_free

Fix regression use-after-free

xrdp/xrdp_wm.c

@@ -574,8 +574,11 @@ xrdp_wm_init(struct xrdp_wm *self)
     load_xrdp_config(self->xrdp_config, self->session->xrdp_ini,
                      self->screen->bpp);
 
-    /* Load the font */
+    /* Remove a font loaded on the previous config */
     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);
     self->default_font = xrdp_font_create(self, dpi);