From 7cac7bb99f962e268796fe5f7566d0eaffd09bb6 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Fri, 1 Apr 2016 08:40:07 +0300 Subject: [PATCH] dwrite: Always initialize context and font table pointers. Signed-off-by: Nikolay Sivov Signed-off-by: Alexandre Julliard --- dlls/dwrite/opentype.c | 3 +++ dlls/dwrite/tests/font.c | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7fb174931e3..97a786d17b4 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -967,6 +967,9 @@ HRESULT opentype_get_font_table(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_ if (found) *found = FALSE; if (table_size) *table_size = 0; + *table_data = NULL; + *table_context = NULL; + if (type == DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION) { const TTC_Header_V1 *ttc_header; void * ttc_context; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9ba8b6dfd30..ec631bd681b 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2923,6 +2923,15 @@ static void test_TryGetFontTable(void) IDWriteFontFace_ReleaseFontTable(fontface, context2); IDWriteFontFace_ReleaseFontTable(fontface, context); + /* table does not exist */ + exists = TRUE; + context = (void*)0xdeadbeef; + table = (void*)0xdeadbeef; + hr = IDWriteFontFace_TryGetFontTable(fontface, 0xabababab, &table, &size, &context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists == FALSE, "got %d\n", exists); + ok(context == NULL && table == NULL, "got context %p, table pointer %p\n", context, table); + IDWriteFontFace_Release(fontface); IDWriteFontFile_Release(file); IDWriteFactory_Release(factory);