1 files changed, 4 insertions, 0 deletions

diff --git a/src/frame.c b/src/frame.c
index 759e21c25c8..71513355184 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -335,6 +335,7 @@ make_frame (mini_p)
   f->win_gravity = 0;
 #ifdef USE_FONT_BACKEND
   f->font_driver_list = NULL;
+  f->font_data_list = NULL;
 #endif  /* USE_FONT_BACKEND */
 
   root_window = make_window ();
@@ -1484,6 +1485,9 @@ The functions are run with one arg, the frame to be deleted.  */)
      memory. */
   free_glyphs (f);
 
+  /* Give chance to each font driver to free a frame specific data.  */
+  font_update_drivers (f, Qnil);
+
   /* Mark all the windows that used to be on FRAME as deleted, and then
      remove the reference to them.  */
   delete_all_subwindows (XWINDOW (f->root_window));