[Emacs-diffs] trunk r115447: * font.c (font_find_for_lface): Ensure SAFE_FREE on return.

[Dmitry Antipov]

------------------------------------------------------------
revno: 115447
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-12-10 07:36:36 +0400
message:
  * font.c (font_find_for_lface): Ensure SAFE_FREE on return.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/font.c                     font.c-20091113204419-o5vbwnq5f7feedwu-8540

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-10 02:32:52 +0000
+++ b/src/ChangeLog     2013-12-10 03:36:36 +0000
@@ -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  <address@hidden>
 

=== modified file 'src/font.c'
--- a/src/font.c        2013-12-04 13:08:30 +0000
+++ b/src/font.c        2013-12-10 03:36:36 +0000
@@ -3209,7 +3209,10 @@
                      val = font_select_entity (f, entities,
                                                attrs, pixel_size, c);
                      if (! NILP (val))
-                        return val;
+                       {
+                         SAFE_FREE ();
+                         return val;
+                       }
                    }
                }
            }