Eric Pouech : msvcrt: symbol undecoration: Really check that we get a template string before making use of it.
Module: wine Branch: master Commit: 0920f8e7780ae9b495c9e254d8d529578f5c60e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0920f8e7780ae9b495c9e254d8... Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 21 22:06:11 2008 +0100 msvcrt: symbol undecoration: Really check that we get a template string before making use of it. --- dlls/msvcrt/tests/cpp.c | 1 + dlls/msvcrt/undname.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 85544c0..2788a56 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -984,6 +984,7 @@ static void test_demangle(void) {"?$AAA@$DBAB@", "AAA<`template-parameter257'>"}, {"?$AAA@$D?4@", "AAA<`template-parameter-5'>"}, {"?$AAA(a)PAUBBB@@", "AAA<struct BBB *>"}, +{"??$ccccc(a)PAVaaa@@@bar(a)bb@foo@@DGPAV0(a)PAV0@PAVee@@IPAPAVaaa@@1(a)Z", "private: static class bar * __stdcall foo::bb::bar::ccccc<class aaa *>(class bar *,class ee *,unsigned int,class aaa **,class ee *)"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index d88cf79..dfc2241 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -538,8 +538,8 @@ static BOOL get_class(struct parsed_symbol* sym) if (*++sym->current == '$') { sym->current++; - name = get_template_name(sym); - str_array_push(sym, name, -1, &sym->names); + if ((name = get_template_name(sym))) + str_array_push(sym, name, -1, &sym->names); } break; default: @@ -1292,17 +1292,17 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) str_array_push(sym, function_name, -1, &sym->stack); break; } - sym->stack.start = 1; } else if (*sym->current == '$') { /* Strange construct, it's a name with a template argument list and that's all. */ sym->current++; - sym->result = get_template_name(sym); - ret = TRUE; + ret = (sym->result = get_template_name(sym)) != NULL; goto done; } + else if (*sym->current == '?' && sym->current[1] == '$') + do_after = 5; /* Either a class name, or '@' if the symbol is not a class member */ switch (*sym->current) @@ -1331,6 +1331,9 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) case 3: sym->flags &= ~UNDNAME_NO_FUNCTION_RETURNS; break; + case 5: + sym->names.start = 1; + break; } /* Function/Data type and access level */
participants (1)
-
Alexandre Julliard