* font.c (font_find_for_lface): Ensure SAFE_FREE on return.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0d61ef48154cc4a873278fc34e9d49a8ce6f2ef1..25271d6f6b89beb72315735ab7526b4c779dfec2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
        * xdisp.c (display_tool_bar_line): Don't extend on a previously
        drawn tool bar items (Bug#16058).
+       * font.c (font_find_for_lface): Ensure SAFE_FREE on return.
 
 2013-12-09  Ken Brown  <kbrown@cornell.edu>
 

diff --git a/src/font.c b/src/font.c
index ad604ebe744213778db41ab0d9bc813171442904..fb56b3d3fb3a37a3ce60f805f47a1160de9c53d0 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -3209,7 +3209,10 @@ font_find_for_lface (struct frame *f, Lisp_Object *attrs, Lisp_Object spec, int
                      val = font_select_entity (f, entities,
                                                attrs, pixel_size, c);
                      if (! NILP (val))
-                        return val;
+                       {
+                         SAFE_FREE ();
+                         return val;
+                       }
                    }
                }
            }