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

Add a sanity check and an error message to linkAt when the index is outside the tokens range.

This commit is contained in:
Edoardo Prezioso 2011-11-19 13:34:36 +01:00
parent fa34a14d57
commit ccdb18f213
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/token.cpp
View File

@ -224,13 +224,39 @@ Token *Token::tokAt(int index)
const Token *Token::linkAt(int index) const const Token *Token::linkAt(int index) const
{ {
const Token *tok = this->tokAt(index); const Token *tok = this->tokAt(index);
return tok->link(); if (!tok) {
std::list<ErrorLogger::ErrorMessage::FileLocation> locationList;
ErrorLogger::ErrorMessage::FileLocation loc;
loc.setfile("");
loc.line = this->linenr();
locationList.push_back(loc);
const ErrorLogger::ErrorMessage errmsg(locationList,
Severity::error,
"Internal error. Token::linkAt called with index outside the tokens range.",
"cppcheckError",
false);
Check::reportError(errmsg);
}
return tok ? tok->link() : 0;
} }
Token *Token::linkAt(int index) Token *Token::linkAt(int index)
{ {
Token *tok = this->tokAt(index); Token *tok = this->tokAt(index);
return tok->link(); if (!tok) {
std::list<ErrorLogger::ErrorMessage::FileLocation> locationList;
ErrorLogger::ErrorMessage::FileLocation loc;
loc.setfile("");
loc.line = this->linenr();
locationList.push_back(loc);
const ErrorLogger::ErrorMessage errmsg(locationList,
Severity::error,
"Internal error. Token::linkAt called with index outside the tokens range.",
"cppcheckError",
false);
Check::reportError(errmsg);
}
return tok ? tok->link() : 0;
} }
const std::string &Token::strAt(int index) const const std::string &Token::strAt(int index) const