Merge from emacs-24; up to 2012-04-20T05:47:55Z!eliz@gnu.org

2 files changed, 9 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8063c8d8166..a4d7bb64919 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-05  Jim Meyering  <meyering@redhat.com>
+
+        * w32font.c (fill_in_logfont): NUL-terminate a string (Bug#11372).
+
 2012-05-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * data.c (PUT_ERROR): New macro.
diff --git a/src/w32font.c b/src/w32font.c
index dab9f4c61b4..8badace9635 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -2045,8 +2045,11 @@ fill_in_logfont (FRAME_PTR f, LOGFONT *logfont, Lisp_Object font_spec)
         /* Font families are interned, but allow for strings also in case of
            user input.  */
       else if (SYMBOLP (tmp))
-        strncpy (logfont->lfFaceName,
-                 SDATA (ENCODE_SYSTEM (SYMBOL_NAME (tmp))), LF_FACESIZE);
+        {
+          strncpy (logfont->lfFaceName,
+                   SDATA (ENCODE_SYSTEM (SYMBOL_NAME (tmp))), LF_FACESIZE);
+          logfont->lfFaceName[LF_FACESIZE-1] = '\0';
+        }
     }
 
   tmp = AREF (font_spec, FONT_ADSTYLE_INDEX);