[PATCH 1/1] mlang: In GetFontCodePages add another null check (Coverity)

[Fabian Maurer]

From: Fabian Maurer

---
 dlls/mlang/mlang.c       | 3 ++-
 dlls/mlang/tests/mlang.c | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index 3ff3c8b34bb..ea919402c68 100644
--- a/dlls/mlang/mlang.c
+++ b/dlls/mlang/mlang.c
@@ -3478,7 +3478,8 @@ static HRESULT WINAPI fnIMLangFontLink2_GetFontCodePages(IMLangFontLink2 *iface,
     GetTextCharsetInfo(hdc, &fontsig, 0);
     SelectObject(hdc, old_font);

-    *codepages = fontsig.fsCsb[0];
+    if (codepages)
+        *codepages = fontsig.fsCsb[0];
     TRACE("ret 0x%lx\n", fontsig.fsCsb[0]);

return S_OK;
diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index 83caaf163a6..cc33dd1827f 100644
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -2827,6 +2827,9 @@ static void test_MapFont(IMLangFontLink *font_link, IMLangFontLink2 *font_link2)
     ok(ret == E_FAIL && !font_codepages, "expected E_FAIL, but got: %lx, font_codepages:%lx \n",
             ret, font_codepages);

+    ret = IMLangFontLink_GetFontCodePages(font_link, hdc, font1, NULL);
+    ok(ret == S_OK, "expected S_OK, but got: %lx\n", ret);
+
     IMLangFontLink_ResetFontMapping(font_link);
     IMLangFontLink2_ResetFontMapping(font_link2);
     ReleaseDC(NULL, hdc);