[Emacs-diffs] trunk r113049: font.c (Ffont_spec): Signal an error for an invalid font name.

[Kenichi Handa]

------------------------------------------------------------
revno: 113049 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: K. Handa <address@hidden>
branch nick: trunk
timestamp: Tue 2013-06-18 23:51:25 +0900
message:
  font.c (Ffont_spec): Signal an error for an invalid font name.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/font.c                     font.c-20091113204419-o5vbwnq5f7feedwu-8540

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-06-18 11:17:50 +0000
+++ b/src/ChangeLog     2013-06-18 14:49:59 +0000
@@ -1,3 +1,7 @@
+2013-06-18  Kenichi Handa  <address@hidden>
+
+       * font.c (Ffont_spec): Signal an error for an invalid font name.
+
 2013-06-18  Paul Eggert  <address@hidden>
 
        Porting fixes for merged specpdl and backtrace stacks (Bug#14643).

=== modified file 'src/font.c'
--- a/src/font.c        2013-05-18 05:32:17 +0000
+++ b/src/font.c        2013-06-18 14:45:08 +0000
@@ -3863,7 +3863,8 @@
       if (EQ (key, QCname))
        {
          CHECK_STRING (val);
-         font_parse_name (SSDATA (val), SBYTES (val), spec);
+         if (font_parse_name (SSDATA (val), SBYTES (val), spec) < 0)
+           error ("Invalid font name: %s", SSDATA (val));
          font_put_extra (spec, key, val);
        }
       else