[PATCH 5/5] dwrite: Improve error handling in ConvertFontToLOGFONT() (Coverity)

[Nikolay Sivov]

---

-------------- next part --------------
From d9845c68ff05caf51b08ab718476eec3b347e87b Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov at codeweavers.com>
Date: Mon, 8 Feb 2016 12:11:51 +0300
Subject: [PATCH 5/5] dwrite: Improve error handling in ConvertFontToLOGFONT()

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 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,
-- 
2.7.0