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>
(cherry picked from commit 7a1e7cbeee
)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
parent
737adb2684
commit
1d23985d64
|
@ -1096,6 +1096,8 @@ static void test_demangle_datatype(void)
|
||||||
"class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,32256>",TRUE},
|
"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@@@",
|
||||||
"?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", FALSE},
|
"?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);
|
int i, num_test = ARRAY_SIZE(demangle);
|
||||||
|
|
||||||
|
|
|
@ -879,7 +879,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct,
|
||||||
goto done;
|
goto done;
|
||||||
if (modifier)
|
if (modifier)
|
||||||
modifier = str_printf(sym, "%s %s", modifier, ptr_modif);
|
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);
|
modifier = str_printf(sym, " %s", ptr_modif);
|
||||||
if (!get_calling_convention(*sym->current++,
|
if (!get_calling_convention(*sym->current++,
|
||||||
&call_conv, &exported,
|
&call_conv, &exported,
|
||||||
|
|
Loading…
Reference in New Issue