walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #549 from simartin/ticket_6437 

Ticket #6347: Fix use after delete when simplifying template instantiations
This commit is contained in:
amai2012 2015-03-14 22:30:58 +01:00
parent 4ec2df92b7 4c916641cc
commit 40769c9a59
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/templatesimplifier.cpp
View File

@ -1052,8 +1052,8 @@ bool TemplateSimplifier::simplifyCalculations(Token *_tokens)
ret = true;
} else if (Token::Match(tok->previous(), "[=([,] 0 [+|]") ||
Token::Match(tok->previous(), "return|case 0 [+|]")) {
tok->deleteNext();
tok->deleteThis();
tok = tok->previous();
tok->deleteNext(2);
ret = true;
} else if (Token::Match(tok->previous(), "[=[(,] 0 * %name% ,|]|)|;|=|%cop%") ||
Token::Match(tok->previous(), "[=[(,] 0 * %num% ,|]|)|;|%op%") ||
@ -1232,7 +1232,6 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
break;
}
}
Token * const tok2 = *iter2;
if (tok2->str() != name)
continue;

11
test/testsimplifytemplate.cpp
View File

@ -82,6 +82,7 @@ private:
TEST_CASE(template49); // #6237 - template instantiation
TEST_CASE(template50); // #4272 - simple partial specialization
TEST_CASE(template51); // #6172 - crash upon valid code
TEST_CASE(template52); // #6437 - crash upon valid code
TEST_CASE(template_unhandled);
TEST_CASE(template_default_parameter);
TEST_CASE(template_default_type);
@ -927,6 +928,16 @@ private:
"}");
}
void template52() { // #6437
tok("template <int value> int sum() { "
" return value + sum<value/2>(); "
"} "
"template<int x, int y> int calculate_value() { "
" return sum<x - y>(); "
"} "
"int value = calculate_value<1,1>();");
}
void template_default_parameter() {
{
const char code[] = "template <class T, int n=3>\n"