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

Add missing types to Platform::platformString(). Add another pattern to Tokenizer::findGarbageCode() to avoid potential crash in Valueflow

This commit is contained in:
Alexander Mai 2017-06-06 22:15:11 +02:00
parent 9da28d5f4c
commit ce13b75967
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/platform.h
View File

@ -111,16 +111,20 @@ namespace cppcheck {
const char *platformString() const { const char *platformString() const {
switch (platformType) { switch (platformType) {
case Unix32: case Unspecified:
return "unix32"; return "Unspecified";
case Unix64: case Native:
return "unix64"; return "Native";
case Win32A: case Win32A:
return "win32A"; return "win32A";
case Win32W: case Win32W:
return "win32W"; return "win32W";
case Win64: case Win64:
return "win64"; return "win64";
case Unix32:
return "unix32";
case Unix64:
return "unix64";
case AVR8: case AVR8:
return "avr8"; return "avr8";
default: default:

27
lib/tokenize.cpp
View File

@ -8130,6 +8130,18 @@ void Tokenizer::validate() const
cppcheckError(lastTok); cppcheckError(lastTok);
} }
static const std::set<std::string> controlFlowKeywords = make_container< std::set<std::string> > () <<
"goto" <<
"do" <<
"if" <<
"else" <<
"for" <<
"while" <<
"switch" <<
"case" <<
"break" <<
"continue" <<
"return";
const Token * Tokenizer::findGarbageCode() const const Token * Tokenizer::findGarbageCode() const
{ {
@ -8178,23 +8190,14 @@ const Token * Tokenizer::findGarbageCode() const
return list.back(); return list.back();
if (list.back()->str() == ")" && !Token::Match(list.back()->link()->previous(), "%name% (")) if (list.back()->str() == ")" && !Token::Match(list.back()->link()->previous(), "%name% ("))
return list.back(); return list.back();
if (Token::Match(list.back(), "void|char|short|int|long|float|double|const|volatile|static|inline|struct|class|enum|union|template|sizeof|break|continue|typedef")) if (Token::Match(list.back(), "void|char|short|int|long|float|double|const|volatile|static|inline|struct|class|enum|union|template|sizeof|case|break|continue|typedef"))
return list.back(); return list.back();
if ((list.back()->str()==")"||list.back()->str()=="}") && list.back()->previous() && controlFlowKeywords.find(list.back()->previous()->str()) != controlFlowKeywords.end())
return list.back()->previous();
return nullptr; return nullptr;
} }
static const std::set<std::string> controlFlowKeywords = make_container< std::set<std::string> > () <<
"goto" <<
"do" <<
"if" <<
"else" <<
"for" <<
"while" <<
"switch" <<
"break" <<
"continue" <<
"return";
bool Tokenizer::isGarbageExpr(const Token *start, const Token *end) bool Tokenizer::isGarbageExpr(const Token *start, const Token *end)
{ {