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

Fix some segmentation faults seen while reducing #5743 (sorry, no test cases supplied)

This commit is contained in:
Alexander Mai 2014-04-29 20:16:50 +02:00
parent b5e023a46c
commit 4815e3c4c5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tokenize.cpp
View File

@ -103,7 +103,7 @@ Token *Tokenizer::copyTokens(Token *dest, const Token *first, const Token *last,
std::stack<Token *> links; std::stack<Token *> links;
Token *tok2 = dest; Token *tok2 = dest;
unsigned int linenrs = dest->linenr(); unsigned int linenrs = dest->linenr();
unsigned int commonFileIndex = dest->fileIndex(); const unsigned int commonFileIndex = dest->fileIndex();
for (const Token *tok = first; tok != last->next(); tok = tok->next()) { for (const Token *tok = first; tok != last->next(); tok = tok->next()) {
tok2->insertToken(tok->str()); tok2->insertToken(tok->str());
tok2 = tok2->next(); tok2 = tok2->next();
@ -2640,7 +2640,7 @@ void Tokenizer::setVarId()
std::map<std::string, unsigned int> varlist; std::map<std::string, unsigned int> varlist;
const Token* tokStart = Token::findsimplematch(tok, "{"); const Token* tokStart = Token::findsimplematch(tok, "{");
if (tokStart) { if (tokStart) {
for (const Token *tok2 = tokStart->next(); tok2 != tokStart->link(); tok2 = tok2->next()) { for (const Token *tok2 = tokStart->next(); tok2 && tok2 != tokStart->link(); tok2 = tok2->next()) {
// skip parentheses.. // skip parentheses..
if (tok2->link()) { if (tok2->link()) {
if (tok2->str() == "{") if (tok2->str() == "{")
@ -5234,7 +5234,7 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, Token * tokEnd, bool only_k_r_
continue; continue;
} else if (tok->str() == "(") { } else if (tok->str() == "(") {
if (isCPP()) { if (isCPP()) {
for (Token * tok2 = tok; tok2 != tok->link(); tok2 = tok2->next()) { for (Token * tok2 = tok; tok2 && tok2 != tok->link(); tok2 = tok2->next()) {
if (Token::Match(tok2, "[(,] [")) { if (Token::Match(tok2, "[(,] [")) {
// lambda function at tok2->next() // lambda function at tok2->next()
// find start of lambda body // find start of lambda body