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

[Fabian Maurer (＠DarkShadow44)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6895

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

[Fabian Maurer]

From: Fabian Maurer <dark.shadow4(a)web.de>

---
 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);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6895

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

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=149923

Your paranoid android.


=== w1064v1507 (32 bit report) ===

mlang:
mlang.c:2805: Test failed: expected !NULL/!NULL, got 00000000/250A0529
mlang.c:2831: Test failed: expected S_OK, but got: 80004005

=== w1064v1507 (64 bit report) ===

mlang:
mlang.c:2805: Test failed: expected !NULL/!NULL, got 0000000000000000/00000000250A0529
mlang.c:2831: Test failed: expected S_OK, but got: 80004005

=== debian11b (64 bit WoW report) ===

winmm:
mci: Timeout