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

VS: Fixed compiler warnings

This commit is contained in:
Daniel Marjamäki 2010-11-20 11:48:03 +01:00
parent d021cd9074
commit cda44e0c39
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lib/checkbufferoverrun.cpp
View File

@ -232,8 +232,8 @@ static bool for_condition(const Token * const tok2, unsigned int varid, std::str
if (Token::Match(tok2, "%varid% < %num% ;", varid)) if (Token::Match(tok2, "%varid% < %num% ;", varid))
{ {
maxMinFlipped = false; maxMinFlipped = false;
long value = MathLib::toLongNumber(tok2->strAt(2)); const MathLib::bigint value = MathLib::toLongNumber(tok2->strAt(2));
max_value = MathLib::toString<long>(value - 1); max_value = MathLib::toString<MathLib::bigint>(value - 1);
} }
else if (Token::Match(tok2, "%varid% <= %num% ;", varid)) else if (Token::Match(tok2, "%varid% <= %num% ;", varid))
{ {
@ -243,9 +243,9 @@ static bool for_condition(const Token * const tok2, unsigned int varid, std::str
else if (Token::Match(tok2, " %num% < %varid% ;", varid)) else if (Token::Match(tok2, " %num% < %varid% ;", varid))
{ {
maxMinFlipped = true; maxMinFlipped = true;
long value = MathLib::toLongNumber(tok2->str()); const MathLib::bigint value = MathLib::toLongNumber(tok2->str());
max_value = min_value; max_value = min_value;
min_value = MathLib::toString<long>(value + 1); min_value = MathLib::toString<MathLib::bigint>(value + 1);
} }
else if (Token::Match(tok2, "%num% <= %varid% ;", varid)) else if (Token::Match(tok2, "%num% <= %varid% ;", varid))
{ {
@ -286,28 +286,28 @@ static bool for3(const Token * const tok,
if (!MathLib::isInt(tok->strAt(2))) if (!MathLib::isInt(tok->strAt(2)))
return false; return false;
const int num = MathLib::toLongNumber(tok->strAt(2)); const MathLib::bigint num = MathLib::toLongNumber(tok->strAt(2));
// We have for example code: "for(i=2;i<22;i+=6) // We have for example code: "for(i=2;i<22;i+=6)
// We can calculate that max value for i is 20, not 21 // We can calculate that max value for i is 20, not 21
// 21-2 = 19 // 21-2 = 19
// 19/6 = 3 // 19/6 = 3
// 6*3+2 = 20 // 6*3+2 = 20
long max = MathLib::toLongNumber(max_value); MathLib::bigint max = MathLib::toLongNumber(max_value);
long min = MathLib::toLongNumber(min_value); MathLib::bigint min = MathLib::toLongNumber(min_value);
max = ((max - min) / num) * num + min; max = ((max - min) / num) * num + min;
max_value = MathLib::toString<long>(max); max_value = MathLib::toString<MathLib::bigint>(max);
} }
else if (Token::Match(tok, "%varid% = %varid% + %num% )", varid)) else if (Token::Match(tok, "%varid% = %varid% + %num% )", varid))
{ {
if (!MathLib::isInt(tok->strAt(4))) if (!MathLib::isInt(tok->strAt(4)))
return false; return false;
const int num = MathLib::toLongNumber(tok->strAt(4)); const MathLib::bigint num = MathLib::toLongNumber(tok->strAt(4));
long max = MathLib::toLongNumber(max_value); MathLib::bigint max = MathLib::toLongNumber(max_value);
long min = MathLib::toLongNumber(min_value); MathLib::bigint min = MathLib::toLongNumber(min_value);
max = ((max - min) / num) * num + min; max = ((max - min) / num) * num + min;
max_value = MathLib::toString<long>(max); max_value = MathLib::toString<MathLib::bigint>(max);
} }
else if (Token::Match(tok, "%varid% -= %num% )", varid) || else if (Token::Match(tok, "%varid% -= %num% )", varid) ||
Token::Match(tok, "%varid% = %num% - %varid% )", varid)) Token::Match(tok, "%varid% = %num% - %varid% )", varid))
@ -315,23 +315,23 @@ static bool for3(const Token * const tok,
if (!MathLib::isInt(tok->strAt(2))) if (!MathLib::isInt(tok->strAt(2)))
return false; return false;
const int num = MathLib::toLongNumber(tok->strAt(2)); const MathLib::bigint num = MathLib::toLongNumber(tok->strAt(2));
long max = MathLib::toLongNumber(max_value); MathLib::bigint max = MathLib::toLongNumber(max_value);
long min = MathLib::toLongNumber(min_value); MathLib::bigint min = MathLib::toLongNumber(min_value);
max = ((max - min) / num) * num + min; max = ((max - min) / num) * num + min;
max_value = MathLib::toString<long>(max); max_value = MathLib::toString<MathLib::bigint>(max);
} }
else if (Token::Match(tok, "%varid% = %varid% - %num% )", varid)) else if (Token::Match(tok, "%varid% = %varid% - %num% )", varid))
{ {
if (!MathLib::isInt(tok->strAt(4))) if (!MathLib::isInt(tok->strAt(4)))
return false; return false;
const int num = MathLib::toLongNumber(tok->strAt(4)); const MathLib::bigint num = MathLib::toLongNumber(tok->strAt(4));
long max = MathLib::toLongNumber(max_value); MathLib::bigint max = MathLib::toLongNumber(max_value);
long min = MathLib::toLongNumber(min_value); MathLib::bigint min = MathLib::toLongNumber(min_value);
max = ((max - min) / num) * num + min; max = ((max - min) / num) * num + min;
max_value = MathLib::toString<long>(max); max_value = MathLib::toString<MathLib::bigint>(max);
} }
else if (Token::Match(tok, "--| %varid% --| )", varid)) else if (Token::Match(tok, "--| %varid% --| )", varid))
{ {
@ -509,7 +509,7 @@ void CheckBufferOverrun::checkFunctionCall(const Token &tok, unsigned int par, c
{ {
if (Token::Match(tok2, ", %num% ,|)")) if (Token::Match(tok2, ", %num% ,|)"))
{ {
const long sz = MathLib::toLongNumber(tok2->strAt(1)); const MathLib::bigint sz = MathLib::toLongNumber(tok2->strAt(1));
unsigned int elements = 1; unsigned int elements = 1;
for (unsigned int i = 0; i < arrayInfo.num.size(); ++i) for (unsigned int i = 0; i < arrayInfo.num.size(); ++i)
elements *= arrayInfo.num[i]; elements *= arrayInfo.num[i];
@ -531,7 +531,7 @@ void CheckBufferOverrun::checkFunctionCall(const Token &tok, unsigned int par, c
{ {
if (Token::Match(tok2, ", %num% , %num% ,|)")) if (Token::Match(tok2, ", %num% , %num% ,|)"))
{ {
const long sz = MathLib::toLongNumber(tok2->strAt(1)) * MathLib::toLongNumber(tok2->strAt(3)); const MathLib::bigint sz = MathLib::toLongNumber(MathLib::multiply(tok2->strAt(1), tok2->strAt(3)));
unsigned int elements = 1; unsigned int elements = 1;
for (unsigned int i = 0; i < arrayInfo.num.size(); ++i) for (unsigned int i = 0; i < arrayInfo.num.size(); ++i)
elements *= arrayInfo.num[i]; elements *= arrayInfo.num[i];
@ -813,7 +813,7 @@ void CheckBufferOverrun::checkScope(const Token *tok, const std::vector<std::str
const std::string snprintfPattern = varid > 0 ? std::string("snprintf ( %varid% , %num% ,") : ("snprintf ( " + varnames + " , %num% ,"); const std::string snprintfPattern = varid > 0 ? std::string("snprintf ( %varid% , %num% ,") : ("snprintf ( " + varnames + " , %num% ,");
if (Token::Match(tok, snprintfPattern.c_str(), varid)) if (Token::Match(tok, snprintfPattern.c_str(), varid))
{ {
const long n = MathLib::toLongNumber(tok->strAt(4 + varc)); const MathLib::bigint n = MathLib::toLongNumber(tok->strAt(4 + varc));
if (n > total_size) if (n > total_size)
outOfBounds(tok->tokAt(4 + varc), "snprintf size"); outOfBounds(tok->tokAt(4 + varc), "snprintf size");
} }
@ -851,7 +851,7 @@ void CheckBufferOverrun::checkScope(const Token *tok, const ArrayInfo &arrayInfo
std::vector<unsigned int> indexes; std::vector<unsigned int> indexes;
for (const Token *tok2 = tok->next(); Token::Match(tok2, "[ %num% ]"); tok2 = tok2->tokAt(3)) for (const Token *tok2 = tok->next(); Token::Match(tok2, "[ %num% ]"); tok2 = tok2->tokAt(3))
{ {
const long index = MathLib::toLongNumber(tok2->strAt(1)); const MathLib::bigint index = MathLib::toLongNumber(tok2->strAt(1));
if (index < 0) if (index < 0)
{ {
indexes.clear(); indexes.clear();
@ -1006,7 +1006,7 @@ void CheckBufferOverrun::checkScope(const Token *tok, const ArrayInfo &arrayInfo
{ {
if (tok->str() == "strncat") if (tok->str() == "strncat")
{ {
const long n = MathLib::toLongNumber(tok->strAt(6)); const MathLib::bigint n = MathLib::toLongNumber(tok->strAt(6));
if (static_cast<unsigned long>(n) >= total_size) if (static_cast<unsigned long>(n) >= total_size)
strncatUsage(tok); strncatUsage(tok);
} }
@ -1014,7 +1014,7 @@ void CheckBufferOverrun::checkScope(const Token *tok, const ArrayInfo &arrayInfo
// Dangerous usage of strncpy + strncat.. // Dangerous usage of strncpy + strncat..
if (Token::Match(tok->tokAt(8), "; strncat ( %varid% , %any% , %num% )", arrayInfo.varid)) if (Token::Match(tok->tokAt(8), "; strncat ( %varid% , %any% , %num% )", arrayInfo.varid))
{ {
const long n = MathLib::toLongNumber(tok->strAt(6)) + MathLib::toLongNumber(tok->strAt(15)); const MathLib::bigint n = MathLib::toLongNumber(tok->strAt(6)) + MathLib::toLongNumber(tok->strAt(15));
if (static_cast<unsigned long>(n) > total_size) if (static_cast<unsigned long>(n) > total_size)
strncatUsage(tok->tokAt(9)); strncatUsage(tok->tokAt(9));
} }
@ -1058,7 +1058,7 @@ void CheckBufferOverrun::checkScope(const Token *tok, const ArrayInfo &arrayInfo
// snprintf.. // snprintf..
if (total_size > 0 && Token::Match(tok, "snprintf ( %varid% , %num% ,", arrayInfo.varid)) if (total_size > 0 && Token::Match(tok, "snprintf ( %varid% , %num% ,", arrayInfo.varid))
{ {
const long n = MathLib::toLongNumber(tok->strAt(4)); const MathLib::bigint n = MathLib::toLongNumber(tok->strAt(4));
if (static_cast<unsigned long>(n) > total_size) if (static_cast<unsigned long>(n) > total_size)
outOfBounds(tok->tokAt(4), "snprintf size"); outOfBounds(tok->tokAt(4), "snprintf size");
} }