[PATCH 0/2] MR3895: wineps: Don't crash when loading Type 1 font in T42_download_header.

[PATCH 1/2] wineps.drv: Remove unused hmtx_tab field from TYPE42 structure.

[Piotr Caban]

From: Piotr Caban

---
 dlls/wineps.drv/type42.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c
index 9e75d24eca4..e495ddc0394 100644
--- a/dlls/wineps.drv/type42.c
+++ b/dlls/wineps.drv/type42.c
@@ -69,7 +69,7 @@ static const OTTable tables_templ[] = {
 struct tagTYPE42 {
     OTTable tables[ARRAY_SIZE(tables_templ)];
     int glyf_tab, loca_tab, head_tab; /* indices of glyf, loca and head tables */
-    int hmtx_tab, maxp_tab;
+    int maxp_tab;
     int num_of_written_tables;
     DWORD glyph_sent_size;
     BOOL *glyph_sent;
@@ -170,7 +170,7 @@ TYPE42 *T42_download_header(print_ctx *ctx, char *ps_name,

t42 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*t42));
     memcpy(t42->tables, tables_templ, sizeof(tables_templ));
-    t42->loca_tab = t42->glyf_tab = t42->head_tab = t42->hmtx_tab = -1;
+    t42->loca_tab = t42->glyf_tab = t42->head_tab = -1;
     t42->emsize = emsize;
     t42->num_of_written_tables = 0;

@@ -184,8 +184,6 @@ TYPE42 *T42_download_header(print_ctx *ctx, char *ps_name,
        t42->glyf_tab = i;
    else if(t42->tables[i].MS_tag == MS_MAKE_TAG('h','e','a','d'))
        t42->head_tab = i;
-	else if(t42->tables[i].MS_tag == MS_MAKE_TAG('h','m','t','x'))
-	    t42->hmtx_tab = i;
    else if(t42->tables[i].MS_tag == MS_MAKE_TAG('m','a','x','p'))
        t42->maxp_tab = i;
     }

[PATCH 2/2] wineps.drv: Don't crash if specified font is missing required table in T42_download_header.

[Piotr Caban]

From: Piotr Caban

---
 dlls/wineps.drv/type42.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c
index e495ddc0394..0867881b68e 100644
--- a/dlls/wineps.drv/type42.c
+++ b/dlls/wineps.drv/type42.c
@@ -170,7 +170,6 @@ TYPE42 *T42_download_header(print_ctx *ctx, char *ps_name,

t42 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*t42));
     memcpy(t42->tables, tables_templ, sizeof(tables_templ));
-    t42->loca_tab = t42->glyf_tab = t42->head_tab = -1;
     t42->emsize = emsize;
     t42->num_of_written_tables = 0;

@@ -186,6 +185,9 @@ TYPE42 *T42_download_header(print_ctx *ctx, char *ps_name,
        t42->head_tab = i;
    else if(t42->tables[i].MS_tag == MS_MAKE_TAG('m','a','x','p'))
        t42->maxp_tab = i;
+        else
+            continue;
+        if(!t42->tables[i].len) break;
     }
     if(i < num_of_tables) {
         TRACE("Table %ld has length %ld.  Will use Type 1 font instead.\n", i, t42->tables[i].len);