comctl32/toolbar: Handle NULL string pointer from TBN_GETINFOTIPW.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comctl32/toolbar: Handle NULL string pointer from TBN_GETINFOTIPW.
ae3b3346 · Nikolay Sivov · Alexandre Julliard · 27eee2d9 · ae3b3346 · ae3b3346
Commit ae3b3346 authored Nov 28, 2019 by Nikolay Sivov Committed by Alexandre Julliard Nov 28, 2019
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

toolbar.c dlls/comctl32/tests/toolbar.c +4 -0

toolbar.c dlls/comctl32/toolbar.c +1 -1

No files found.
--- a/dlls/comctl32/tests/toolbar.c
+++ b/dlls/comctl32/tests/toolbar.c
@@ -159,6 +159,7 @@ static LRESULT parent_wnd_notify(LPARAM lParam)
            break;

        case TBN_GETINFOTIPA:
+        case TBN_GETINFOTIPW:
        {
            NMTBGETINFOTIPA *tbgit = (NMTBGETINFOTIPA*)lParam;

@@ -2029,6 +2030,9 @@ static void test_tooltip(void)

    g_ResetDispTextPtr = TRUE;
    SendMessageA(hToolbar, WM_NOTIFY, 0, (LPARAM)&nmtti);
+    /* Same for TBN_GETINFOTIPW */
+    SendMessageA(hToolbar, TB_SETUNICODEFORMAT, TRUE, 0);
+    SendMessageA(hToolbar, WM_NOTIFY, 0, (LPARAM)&nmtti);
    g_ResetDispTextPtr = FALSE;

    DestroyWindow(hToolbar);

--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -6149,7 +6149,7 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm

        TRACE("TBN_GETINFOTIPW - got string %s\n", debugstr_w(tbgit.pszText));

-        len = lstrlenW(tbgit.pszText);
+        len = tbgit.pszText ? lstrlenW(tbgit.pszText) : 0;
        if (len > ARRAY_SIZE(lpnmtdi->szText) - 1)
        {
            /* need to allocate temporary buffer in infoPtr as there