Nikolay Sivov : dwrite: Improve error handling in ConvertFontToLOGFONT() ( Coverity).
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Feb 8 10:09:21 CST 2016
Module: wine
Branch: master
Commit: 15485f538da86264ec1148543174eb480cd8950d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=15485f538da86264ec1148543174eb480cd8950d
Author: Nikolay Sivov <bunglehead at gmail.com>
Date: Mon Feb 8 12:31:46 2016 +0300
dwrite: Improve error handling in ConvertFontToLOGFONT() (Coverity).
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dwrite/gdiinterop.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c
index 794ebee..dcc2f7a 100644
--- a/dlls/dwrite/gdiinterop.c
+++ b/dlls/dwrite/gdiinterop.c
@@ -711,11 +711,11 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface,
if (FAILED(hr) || !exists)
return hr;
- IDWriteLocalizedStrings_FindLocaleName(name, enusW, &index, &exists);
- IDWriteLocalizedStrings_GetString(name, index, logfont->lfFaceName, sizeof(logfont->lfFaceName)/sizeof(WCHAR));
+ hr = IDWriteLocalizedStrings_FindLocaleName(name, enusW, &index, &exists);
+ if (hr == S_OK)
+ hr = IDWriteLocalizedStrings_GetString(name, index, logfont->lfFaceName, sizeof(logfont->lfFaceName)/sizeof(WCHAR));
IDWriteLocalizedStrings_Release(name);
-
- return S_OK;
+ return hr;
}
static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop *iface,
More information about the wine-cvs
mailing list