summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDima Kogan <dima@secretsauce.net>2015-10-20 18:12:55 +0300
committerEli Zaretskii <eliz@gnu.org>2015-10-20 18:12:55 +0300
commit28c58bf739fb5cc528051cfc48770fbfa4e1a319 (patch)
tree12f31f472fd0e9460c228bc3594554a206c80c97
parent90e9cf85be9b36cc11ae52af765b8f4236be8833 (diff)
Fix memory leak in fontset handling
* src/font.c (copy_font_spec): Make a deep copy of the input argument FONT. (Bug#21651)
-rw-r--r--src/font.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/font.c b/src/font.c
index a52a653d29..be55ce9bc7 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3981,7 +3981,10 @@ copy_font_spec (Lisp_Object font)
pcdr = spec->props + FONT_EXTRA_INDEX;
for (tail = AREF (font, FONT_EXTRA_INDEX); CONSP (tail); tail = XCDR (tail))
if (!EQ (XCAR (XCAR (tail)), QCfont_entity))
- *pcdr = Fcons (XCAR (tail), Qnil), pcdr = xcdr_addr (*pcdr);
+ {
+ *pcdr = Fcons (Fcons (XCAR (XCAR (tail)), CDR (XCAR (tail))), Qnil);
+ pcdr = xcdr_addr (*pcdr);
+ }
XSETFONT (new_spec, spec);
return new_spec;