=== modified file 'src/macfont.m' --- src/macfont.m 2013-12-12 14:26:06 +0000 +++ src/macfont.m 2013-12-13 06:37:01 +0000 @@ -2435,11 +2435,14 @@ { Lisp_Object val = assq_no_quit (QCfont_entity, AREF (entity, FONT_EXTRA_INDEX)); - CFStringRef name = XSAVE_POINTER (XCDR (val), 0); + if (CONSP (val) && SAVE_VALUE_P (XCDR (val))) + { + CFStringRef name = XSAVE_POINTER (XCDR (val), 0); - block_input (); - CFRelease (name); - unblock_input (); + block_input (); + CFRelease (name); + unblock_input (); + } } static Lisp_Object