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

Refactorings in CheckOther

This commit is contained in:
Daniel Marjamäki 2017-04-23 07:19:44 +02:00
parent f601a6903f
commit f6ab204dc6
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/checkother.cpp
View File

@ -59,7 +59,7 @@ static const struct CWE CWE783(783U); // Operator Precedence Logic Error
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// The return value of fgetc(), getc(), ungetc(), getchar() etc. is an integer value. // The return value of fgetc(), getc(), ungetc(), getchar() etc. is an integer value.
// If this return value is stored in a character variable and then compared // If this return value is stored in a character variable and then compared
// to compared to EOF, which is an integer, the comparison maybe be false. // to EOF, which is an integer, the comparison maybe be false.
// //
// Reference: // Reference:
// - Ticket #160 // - Ticket #160
@ -80,7 +80,7 @@ void CheckOther::checkCastIntToCharAndBack()
std::map<unsigned int, std::string> vars; std::map<unsigned int, std::string> vars;
for (const Token* tok = scope->classStart->next(); tok != scope->classEnd; tok = tok->next()) { for (const Token* tok = scope->classStart->next(); tok != scope->classEnd; tok = tok->next()) {
// Quick check to see if any of the matches below have any chances // Quick check to see if any of the matches below have any chances
if (!tok->isName() || !Token::Match(tok, "%var%|EOF %comp%|=")) if (!Token::Match(tok, "%var%|EOF %comp%|="))
continue; continue;
if (Token::Match(tok, "%var% = fclose|fflush|fputc|fputs|fscanf|getchar|getc|fgetc|putchar|putc|puts|scanf|sscanf|ungetc (")) { if (Token::Match(tok, "%var% = fclose|fflush|fputc|fputs|fscanf|getchar|getc|fgetc|putchar|putc|puts|scanf|sscanf|ungetc (")) {
const Variable *var = tok->variable(); const Variable *var = tok->variable();
@ -1127,30 +1127,27 @@ void CheckOther::checkMemsetInvalid2ndParam()
for (std::size_t i = 0; i < functions; ++i) { for (std::size_t i = 0; i < functions; ++i) {
const Scope * scope = symbolDatabase->functionScopes[i]; const Scope * scope = symbolDatabase->functionScopes[i];
for (const Token* tok = scope->classStart->next(); tok && (tok != scope->classEnd); tok = tok->next()) { for (const Token* tok = scope->classStart->next(); tok && (tok != scope->classEnd); tok = tok->next()) {
if (Token::simpleMatch(tok, "memset (")) { if (!Token::simpleMatch(tok, "memset ("))
const Token* firstParamTok = tok->tokAt(2); continue;
if (!firstParamTok)
continue;
const Token* secondParamTok = firstParamTok->nextArgument();
if (!secondParamTok)
continue;
// Second parameter is zero literal, i.e. 0.0f const std::vector<const Token *> args = getArguments(tok);
if (Token::Match(secondParamTok, "%num% ,") && MathLib::isNullValue(secondParamTok->str())) if (args.size() != 3)
continue; continue;
const Token *top = secondParamTok; // Second parameter is zero literal, i.e. 0.0f
while (top->astParent() && top->astParent()->str() != ",") const Token * const secondParamTok = args[1];
top = top->astParent(); if (Token::Match(secondParamTok, "%num% ,") && MathLib::isNullValue(secondParamTok->str()))
continue;
// Check if second parameter is a float variable or a float literal != 0.0f // Check if second parameter is a float variable or a float literal != 0.0f
if (printPortability && astIsFloat(top,false)) { if (printPortability && astIsFloat(secondParamTok,false)) {
memsetFloatError(secondParamTok, top->expressionString()); memsetFloatError(secondParamTok, secondParamTok->expressionString());
} else if (printWarning && secondParamTok->isNumber()) { // Check if the second parameter is a literal and is out of range }
const long long int value = MathLib::toLongNumber(secondParamTok->str());
if (value < -128 || value > 255) if (printWarning && secondParamTok->isNumber()) { // Check if the second parameter is a literal and is out of range
memsetValueOutOfRangeError(secondParamTok, secondParamTok->str()); const long long int value = MathLib::toLongNumber(secondParamTok->str());
} if (value < -128 || value > 255) // FIXME: Use platform char_bits
memsetValueOutOfRangeError(secondParamTok, secondParamTok->str());
} }
} }
} }