From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Tue, 10 Dec 2013 03:36:36 +0000 (+0400)
Subject: * font.c (font_find_for_lface): Ensure SAFE_FREE on return.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~488
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e8374b3959e3fc809b7834e3b85245928ae83774;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 0d61ef48154..25271d6f6b8 100644
--- 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 ad604ebe744..fb56b3d3fb3 100644
--- 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;
+			}
 		    }
 		}
 	    }