[PATCH 0/2] MR8341: user32/tests: Fix 2 out-of-bound accesses in dde tests.

[Yuxuan Shui (＠yshui)]

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

[PATCH 1/2] user32/tests: Fix out-of-bound access in server_end_to_end_callback.

[Yuxuan Shui]

From: Yuxuan Shui <yshui(a)codeweavers.com>

Using test_cmd_w_to_w[str_index - 1] is illegal if str_index is 0.
---
 dlls/user32/tests/dde.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c
index cd97bef165d..00fa72e1fa0 100644
--- a/dlls/user32/tests/dde.c
+++ b/dlls/user32/tests/dde.c
@@ -2430,13 +2430,16 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV
         if (winetest_debug > 1) trace("msg %u strA \"%s\" strW %s\n", msg_index, buffer, wine_dbgstr_w((WCHAR*)buffer));
 
         str_index = msg_index - 4;
-        cmd_w = test_cmd_w_to_w[str_index - 1];
         size_a = strlen(test_cmd_a_to_a) + 1;
-        size_w = (lstrlenW(cmd_w) + 1) * sizeof(WCHAR);
         size_a_to_w = MultiByteToWideChar( CP_ACP, 0, test_cmd_a_to_a, -1, test_cmd_a_to_w,
                                            ARRAY_SIZE(test_cmd_a_to_w)) * sizeof(WCHAR);
-        size_w_to_a = WideCharToMultiByte( CP_ACP, 0, cmd_w, -1,
-                                           test_cmd_w_to_a, sizeof(test_cmd_w_to_a), NULL, NULL );
+        if (str_index)
+        {
+            cmd_w = test_cmd_w_to_w[str_index - 1];
+            size_w = (lstrlenW(cmd_w) + 1) * sizeof(WCHAR);
+            size_w_to_a = WideCharToMultiByte( CP_ACP, 0, cmd_w, -1,
+                                               test_cmd_w_to_a, sizeof(test_cmd_w_to_a), NULL, NULL );
+        }
         switch (str_index)
         {
         case 0:  /* ANSI string */
-- 
GitLab


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

[PATCH 2/2] user32/tests: Handle non-null terminated strings in dde_server_wndprocA/W.

[Yuxuan Shui]

From: Yuxuan Shui <yshui(a)codeweavers.com>

In two cases they can get a cmd string that is not null terminated:

1. A char string passed into lstrcmpW.
2. A char string that has become garbage after undergoing W -> A conversion.
---
 dlls/user32/tests/dde.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c
index 00fa72e1fa0..6f7c98abc73 100644
--- a/dlls/user32/tests/dde.c
+++ b/dlls/user32/tests/dde.c
@@ -1274,7 +1274,12 @@ static LRESULT WINAPI dde_server_wndprocA(HWND hwnd, UINT msg, WPARAM wparam, LP
 
         if ((cmd = GlobalLock((HGLOBAL)hi)))
         {
-            ack.fAck = !lstrcmpA(cmd, exec_cmdA) || !lstrcmpW((LPCWSTR)cmd, exec_cmdW);
+            SIZE_T size;
+            BOOL maybe_w, maybe_a;
+            size = GlobalSize((HGLOBAL)hi);
+            maybe_w = (size % sizeof(WCHAR) == 0) && ((WCHAR *)cmd)[size / sizeof(WCHAR) - 1] == 0;
+            maybe_a = cmd[size - 1] == 0;
+            ack.fAck = (maybe_a && !lstrcmpA(cmd, exec_cmdA)) || (maybe_w && !lstrcmpW((LPCWSTR)cmd, exec_cmdW));
 
             switch (step % 5)
             {
@@ -1407,7 +1412,12 @@ static LRESULT WINAPI dde_server_wndprocW(HWND hwnd, UINT msg, WPARAM wparam, LP
 
         if ((cmd = GlobalLock((HGLOBAL)hi)))
         {
-            ack.fAck = !lstrcmpA(cmd, exec_cmdA) || !lstrcmpW((LPCWSTR)cmd, exec_cmdW);
+            SIZE_T size;
+            BOOL maybe_w, maybe_a;
+            size = GlobalSize((HGLOBAL)hi);
+            maybe_w = (size % sizeof(WCHAR) == 0) && ((WCHAR *)cmd)[size / sizeof(WCHAR) - 1] == 0;
+            maybe_a = cmd[size - 1] == 0;
+            ack.fAck = (maybe_a && !lstrcmpA(cmd, exec_cmdA)) || (maybe_w && !lstrcmpW((LPCWSTR)cmd, exec_cmdW));
 
             switch (step % 5)
             {
-- 
GitLab

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