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

Fixed #1117 (segmentation fault of cppcheck)

This commit is contained in:
Daniel Marjamäki 2009-12-20 12:45:34 +01:00
parent eb8c6aec55
commit 191a913ff9
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/tokenize.cpp
View File

@ -998,15 +998,21 @@ void Tokenizer::simplifyTemplates()
// New type.. // New type..
std::vector<std::string> types2; std::vector<std::string> types2;
s = ""; s = "";
for (const Token *tok3 = tok2->tokAt(2); tok3->str() != ">"; tok3 = tok3->next()) for (const Token *tok3 = tok2->tokAt(2); tok3 && tok3->str() != ">"; tok3 = tok3->next())
{ {
if (!tok3->next())
{
s.clear();
break;
}
if (tok3->str() != ",") if (tok3->str() != ",")
types2.push_back(tok3->str()); types2.push_back(tok3->str());
s += tok3->str(); s += tok3->str();
} }
const std::string type2(s); const std::string type2(s);
if (type.size() != types2.size()) if (type2.empty() || type.size() != types2.size())
{ {
#ifndef NDEBUG #ifndef NDEBUG
std::list<ErrorLogger::ErrorMessage::FileLocation> locationList; std::list<ErrorLogger::ErrorMessage::FileLocation> locationList;
@ -1022,7 +1028,8 @@ void Tokenizer::simplifyTemplates()
_errorLogger->reportErr(errmsg); _errorLogger->reportErr(errmsg);
#endif #endif
if (type2.empty())
continue;
break; break;
} }