Nikolay Sivov : dwrite: Handle font data initialization failure when building collections.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Feb 23 11:24:22 CST 2016
Module: wine
Branch: master
Commit: 7276d5fac1417dd81344db45b3af904f8f2c7d77
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7276d5fac1417dd81344db45b3af904f8f2c7d77
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Feb 23 17:47:14 2016 +0300
dwrite: Handle font data initialization failure when building collections.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dwrite/font.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
index 05b5f55..c0e0e43 100644
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -387,7 +387,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);
@@ -3147,8 +3148,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));
More information about the wine-cvs
mailing list