Fix some segfaults when using newer Microsoft fonts.

mdboom · mdboom · commit 3f9dbd24a8cf · 2013-06-07T13:58:27.000-04:00
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -1621,7 +1621,9 @@ FT2Font::get_glyph_name(const Py::Tuple & args)
 
     if (!FT_HAS_GLYPH_NAMES(face))
     {
-        snprintf(buffer, 128, "uni%04x", glyph_number);
+        /* Note that this generated name must match the name that
+           is generated by ttconv in ttfont_CharStrings_getname. */
+        snprintf(buffer, 128, "uni%08x", glyph_number);
     } else {
         if (FT_Get_Glyph_Name(face, glyph_number, buffer, 128))
         {
@@ -1745,9 +1747,10 @@ FT2Font::get_sfnt(const Py::Tuple & args)
         key[1] = Py::Int(sfnt.encoding_id);
         key[2] = Py::Int(sfnt.language_id);
         key[3] = Py::Int(sfnt.name_id);
-        names[key] = Py::String((char *) sfnt.string,
-                                (int) sfnt.string_len,
-                                "latin-1");
+
+        names[key] = Py::asObject
+            (PyBytes_FromStringAndSize(
+                (const char *)sfnt.string, sfnt.string_len));
     }
     return names;
 }
diff --git a/ttconv/pprdrv_tt.cpp b/ttconv/pprdrv_tt.cpp
@@ -166,6 +166,13 @@ BYTE *GetTable(struct TTFONT *font, const char *name)
 
 } /* end of GetTable() */
 
+static void utf16be_to_ascii(char *dst, char *src, size_t length) {
+    ++src;
+    for (; *src != 0 && length; dst++, src += 2, --length) {
+        *dst = *src;
+    }
+}
+
 /*--------------------------------------------------------------------
 ** Load the 'name' table, get information from it,
 ** and store that information in the font structure.
@@ -311,6 +318,21 @@ void Read_name(struct TTFONT *font)
                 font->PostName[length]=(char)NULL;
                 replace_newlines_with_spaces(font->PostName);
 
+#ifdef DEBUG_TRUETYPE
+                debug("font->PostName=\"%s\"",font->PostName);
+#endif
+                continue;
+            }
+
+            /* Microsoft-format PostScript name */
+            if ( platform == 3 && nameid == 6 )
+            {
+                free(font->PostName);
+                font->PostName = (char*)calloc(sizeof(char),length+1);
+                utf16be_to_ascii(font->PostName, (char *)strings+offset, length);
+                font->PostName[length/2]=(char)NULL;
+                replace_newlines_with_spaces(font->PostName);
+
 #ifdef DEBUG_TRUETYPE
                 debug("font->PostName=\"%s\"",font->PostName);
 #endif
@@ -967,6 +989,20 @@ const char *ttfont_CharStrings_getname(struct TTFONT *font, int charindex)
     char *ptr;
     ULONG len;
 
+    Fixed post_format;
+
+    /* The 'post' table format number. */
+    post_format = getFixed( font->post_table );
+
+    if ( post_format.whole != 2 || post_format.fraction != 0 )
+    {
+        /* We don't have a glyph name table, so generate a name.
+           This generated name must match exactly the name that is
+           generated by FT2Font in get_glyph_name */
+        snprintf(temp, 80, "uni%08x", charindex);
+        return temp;
+    }
+
     GlyphIndex = (int)getUSHORT( font->post_table + 34 + (charindex * 2) );
 
     if ( GlyphIndex <= 257 )            /* If a standard Apple name, */
@@ -1011,11 +1047,6 @@ void ttfont_CharStrings(TTStreamWriter& stream, struct TTFONT *font, std::vector
     /* The 'post' table format number. */
     post_format = getFixed( font->post_table );
 
-    if ( post_format.whole != 2 || post_format.fraction != 0 )
-    {
-        throw TTException("TrueType fontdoes not have a format 2.0 'post' table");
-    }
-
     /* Emmit the start of the PostScript code to define the dictionary. */
     stream.printf("/CharStrings %d dict dup begin\n", glyph_ids.size());
 

Original file line number	Diff line number	Diff line change
`@@ -1621,7 +1621,9 @@ FT2Font::get_glyph_name(const Py::Tuple & args)`
`1621`	`1621`
`1622`	`1622`	`if (!FT_HAS_GLYPH_NAMES(face))`
`1623`	`1623`	`{`
`1624`		`- snprintf(buffer, 128, "uni%04x", glyph_number);`
	`1624`	`+ /* Note that this generated name must match the name that`
	`1625`	`+ is generated by ttconv in ttfont_CharStrings_getname. */`
	`1626`	`+ snprintf(buffer, 128, "uni%08x", glyph_number);`
`1625`	`1627`	`} else {`
`1626`	`1628`	`if (FT_Get_Glyph_Name(face, glyph_number, buffer, 128))`
`1627`	`1629`	`{`
`@@ -1745,9 +1747,10 @@ FT2Font::get_sfnt(const Py::Tuple & args)`
`1745`	`1747`	`key[1] = Py::Int(sfnt.encoding_id);`
`1746`	`1748`	`key[2] = Py::Int(sfnt.language_id);`
`1747`	`1749`	`key[3] = Py::Int(sfnt.name_id);`
`1748`		`- names[key] = Py::String((char *) sfnt.string,`
`1749`		`- (int) sfnt.string_len,`
`1750`		`- "latin-1");`
	`1750`	`+`
	`1751`	`+ names[key] = Py::asObject`
	`1752`	`+ (PyBytes_FromStringAndSize(`
	`1753`	`+ (const char *)sfnt.string, sfnt.string_len));`
`1751`	`1754`	`}`
`1752`	`1755`	`return names;`
`1753`	`1756`	`}`