Index: fttools.c
===================================================================
RCS file: /cvs/OpenBSD/XF4/xc/lib/font/FreeType/fttools.c,v
retrieving revision 1.5
diff -u -r1.5 fttools.c
--- fttools.c	1 Jan 2006 15:32:11 -0000	1.5
+++ fttools.c	2 Jul 2006 16:53:17 -0000
@@ -77,7 +77,7 @@
 
     n = 0;
     for (i = 0; i < slen; i += 2) {
-        if(n >= max)
+        if(n >= max - 1)
             break;
         if(HIBYTE(from+i, byte)!=0)
             *to++='?';
@@ -143,9 +143,10 @@
     /* Pretend that Apple Roman is ISO 8859-1. */
     if(FTGetName(face, nid, TT_PLATFORM_MACINTOSH, TT_MAC_ID_ROMAN, &name)) {
         len = name.string_len;
-        if(len > name_len)
-            len = name_len;
+        if(len > name_len  - 1)
+            len = name_len - 1;
         memcpy(name_return, name.string, len);
+        name_return[len] = '\0'; /* ensure nul terminaison */
         return len;
     }