msvcrt: Fix _unDName crash when demangling class function pointer.

Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Fix _unDName crash when demangling class function pointer.
7a1e7cbe · Piotr Caban · Alexandre Julliard · d9116083 · 7a1e7cbe · 7a1e7cbe
Commit 7a1e7cbe authored Apr 30, 2021 by Piotr Caban Committed by Alexandre Julliard Apr 30, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

cpp.c dlls/msvcrt/tests/cpp.c +2 -0

undname.c dlls/msvcrt/undname.c +1 -1

No files found.
--- a/dlls/msvcrt/tests/cpp.c
+++ b/dlls/msvcrt/tests/cpp.c
@@ -1091,6 +1091,8 @@ static void test_demangle_datatype(void)
            "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,32256>",TRUE},
        { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$01@@@",
            "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", FALSE},
+        { "P8test@@AACXZ", "signed char (__cdecl test::*)(void)", TRUE},
+        { "P8test@@BACXZ", "signed char (__cdecl test::*)(void)const ", TRUE},
    };
    int i, num_test = ARRAY_SIZE(demangle);


--- a/dlls/msvcrt/undname.c
+++ b/dlls/msvcrt/undname.c
@@ -879,7 +879,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct,
                    goto done;
                if (modifier)
                    modifier = str_printf(sym, "%s %s", modifier, ptr_modif);
-                else if(ptr_modif[0])
+                else if(ptr_modif)
                    modifier = str_printf(sym, " %s", ptr_modif);
                if (!get_calling_convention(*sym->current++,
                            &call_conv, &exported,