commit 62cf70d36383aee854db6e775d4fc086f57ca13e
author Alexandre Julliard <julliard@winehq.org> Sat Nov 26 16:29:50 2011 +0100
committer Alexandre Julliard <julliard@winehq.org> Sat Nov 26 16:29:50 2011 +0100
tree 6785746f9dc3b86991650a6793e3dbbe5d08659b
parent 3b729284644c4183958735009f328ca9ea1d0ba7

wineps: Don't crash on missing loca OTF table.

dlls/wineps.drv/type1.c

diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c
index fbda3de..01c9c7e 100644
--- a/dlls/wineps.drv/type1.c
+++ b/dlls/wineps.drv/type1.c
@@ -226,11 +226,20 @@
     *start = *end = 0;
 
     len = GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, NULL, 0);
+    if (len == GDI_ERROR) return FALSE;
     head = HeapAlloc(GetProcessHeap(), 0, len);
     GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, head, len);
     loca_format = get_be_word(head + 50);
 
     len = GetFontData(hdc, MS_MAKE_TAG('l','o','c','a'), 0, NULL, 0);
+    if (len == GDI_ERROR)
+    {
+        len = GetFontData(hdc, MS_MAKE_TAG('C','F','F',' '), 0, NULL, 0);
+        if (len != GDI_ERROR) FIXME( "CFF tables not supported yet\n" );
+        else ERR( "loca table not found\n" );
+        HeapFree(GetProcessHeap(), 0, head);
+        return FALSE;
+    }
     loca = HeapAlloc(GetProcessHeap(), 0, len);
     GetFontData(hdc, MS_MAKE_TAG('l','o','c','a'), 0, loca, len);