dwrite: Handle font data initialization failure when building collections.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> (cherry picked from commit 7276d5fa) Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

dwrite: Handle font data initialization failure when building collections.
61fe2c74 · Nikolay Sivov · Michael Stefaniuc · 85b003cb · 61fe2c74
Commit 61fe2c74 authored Feb 23, 2016 by Nikolay Sivov Committed by Michael Stefaniuc Apr 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

font.c dlls/dwrite/font.c +6 -2

No files found.
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -359,7 +359,8 @@ static void release_font_data(struct dwrite_font_data *data)
        if (data->info_strings[i])
            IDWriteLocalizedStrings_Release(data->info_strings[i]);
    }
-    IDWriteLocalizedStrings_Release(data->names);
+    if (data->names)
+        IDWriteLocalizedStrings_Release(data->names);

    IDWriteFontFile_Release(data->file);
    IDWriteFactory2_Release(data->factory);
@@ -3141,8 +3142,11 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat

            /* alloc and init new font data structure */
            hr = init_font_data(factory, file, face_type, i, &family_name, &font_data);
-            if (FAILED(hr))
+            if (FAILED(hr)) {
+                /* move to next one */
+                hr = S_OK;
                continue;
+            }

            fontstrings_get_en_string(family_name, familyW, sizeof(familyW)/sizeof(WCHAR));