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

sprintf counter improvements

This commit is contained in:
Reijo Tomperi 2009-10-08 16:27:46 +03:00
parent ad5d87ee14
commit 5eee9af974
2 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/checkbufferoverrun.cpp
View File

@ -771,7 +771,7 @@ void CheckBufferOverrun::bufferOverrun()
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
int CheckBufferOverrun::countSprintfLength(const std::string &input_string, const std::list<const Token*> &/*parameters*/) int CheckBufferOverrun::countSprintfLength(const std::string &input_string, const std::list<const Token*> &parameters)
{ {
@ -783,7 +783,8 @@ int CheckBufferOverrun::countSprintfLength(const std::string &input_string, cons
std::string digits_string = ""; std::string digits_string = "";
int digits = 0; int digits = 0;
int check_for_i_d_x_f = 0; int check_for_i_d_x_f = 0;
std::list<const Token*>::const_iterator paramIter = parameters.begin();
int parameterLength = 0;
for (std::string::size_type i = 0; i != input_string.length(); i++) for (std::string::size_type i = 0; i != input_string.length(); i++)
{ {
@ -807,12 +808,27 @@ int CheckBufferOverrun::countSprintfLength(const std::string &input_string, cons
case 'E': case 'E':
case 'g': case 'g':
case 'o': case 'o':
case 's':
case 'u': case 'u':
case 'p': case 'p':
case 'n': case 'n':
if (flag == 0) on_on_next = 1; if (flag == 0)
{
on_on_next = 1;
if (paramIter != parameters.end()) ++paramIter;
}
break; break;
case 's':
if (flag == 0)
{
if (paramIter != parameters.end() && *paramIter && (*paramIter)->str()[0] == '"')
parameterLength = Token::getStrLength(*paramIter);
on_on_next = 1;
if (paramIter != parameters.end()) ++paramIter;
}
break;
case '%': case '%':
if (flag == 1) flag = 0; if (flag == 1) flag = 0;
else else
@ -830,12 +846,21 @@ int CheckBufferOverrun::countSprintfLength(const std::string &input_string, cons
if (on_on_next == 1 && flag == 0) if (on_on_next == 1 && flag == 0)
{ {
//std::cout << digits_string;
digits_string = digits_string.substr(1, digits_string.size()); digits_string = digits_string.substr(1, digits_string.size());
if (check_for_i_d_x_f == 1) digits += std::max(abs(atoi(digits_string.c_str())), 1); int tempDigits = 0;
if (check_for_i_d_x_f == 1)
tempDigits = std::max(abs(atoi(digits_string.c_str())), 1);
else else
digits += abs(atoi(digits_string.c_str())); tempDigits = abs(atoi(digits_string.c_str()));
if (tempDigits < parameterLength)
digits += parameterLength;
else if (parameterLength <= tempDigits)
digits += tempDigits;
else
digits += parameterLength - tempDigits;
parameterLength = 0;
digits_string = ""; digits_string = "";
check_for_i_d_x_f = 0; check_for_i_d_x_f = 0;
@ -863,7 +888,6 @@ int CheckBufferOverrun::countSprintfLength(const std::string &input_string, cons
continue; continue;
} }
j++; j++;
} }

36
test/testbufferoverrun.cpp
View File

@ -1031,43 +1031,29 @@ private:
ASSERT_EQUALS(10, CheckBufferOverrun::countSprintfLength("\\\\\\\\Hello%d \0Text\\\\\\\\", unknownParameter)); ASSERT_EQUALS(10, CheckBufferOverrun::countSprintfLength("\\\\\\\\Hello%d \0Text\\\\\\\\", unknownParameter));
ASSERT_EQUALS(4, CheckBufferOverrun::countSprintfLength("%%%%%d", unknownParameter)); ASSERT_EQUALS(4, CheckBufferOverrun::countSprintfLength("%%%%%d", unknownParameter));
Token strTok;
strTok.str("\"12345\"");
std::list<const Token*> stringAsParameter; std::list<const Token*> stringAsParameter;
{ stringAsParameter.push_back(&strTok);
Token tok; ASSERT_EQUALS(9, CheckBufferOverrun::countSprintfLength("str%s", stringAsParameter));
tok.str("\"12345\""); ASSERT_EQUALS(6, CheckBufferOverrun::countSprintfLength("%-4s", stringAsParameter));
stringAsParameter.push_back(&tok);
}
TODO_ASSERT_EQUALS(9, CheckBufferOverrun::countSprintfLength("str%s", stringAsParameter));
TODO_ASSERT_EQUALS(6, CheckBufferOverrun::countSprintfLength("%-4s", stringAsParameter));
ASSERT_EQUALS(6, CheckBufferOverrun::countSprintfLength("%-5s", stringAsParameter)); ASSERT_EQUALS(6, CheckBufferOverrun::countSprintfLength("%-5s", stringAsParameter));
ASSERT_EQUALS(7, CheckBufferOverrun::countSprintfLength("%-6s", stringAsParameter)); ASSERT_EQUALS(7, CheckBufferOverrun::countSprintfLength("%-6s", stringAsParameter));
std::list<const Token*> intAsParameter; std::list<const Token*> intAsParameter;
{ Token numTok;
Token tok; numTok.str("12345");
tok.str("12345"); stringAsParameter.push_back(&numTok);
stringAsParameter.push_back(&tok);
}
TODO_ASSERT_EQUALS(6, CheckBufferOverrun::countSprintfLength("%02ld", intAsParameter)); TODO_ASSERT_EQUALS(6, CheckBufferOverrun::countSprintfLength("%02ld", intAsParameter));
ASSERT_EQUALS(9, CheckBufferOverrun::countSprintfLength("%08ld", intAsParameter)); ASSERT_EQUALS(9, CheckBufferOverrun::countSprintfLength("%08ld", intAsParameter));
std::list<const Token*> multipleParams; std::list<const Token*> multipleParams;
{ multipleParams.push_back(&strTok);
Token tok;
tok.str("\"12345\"");
multipleParams.push_back(&tok);
multipleParams.push_back(0); multipleParams.push_back(0);
multipleParams.push_back(&numTok);
tok.str("12345");
multipleParams.push_back(&tok);
}
TODO_ASSERT_EQUALS(15, CheckBufferOverrun::countSprintfLength("str%s%d%d", multipleParams)); TODO_ASSERT_EQUALS(15, CheckBufferOverrun::countSprintfLength("str%s%d%d", multipleParams));
ASSERT_EQUALS(26, CheckBufferOverrun::countSprintfLength("str%-6s%08ld%08ld", multipleParams)); ASSERT_EQUALS(26, CheckBufferOverrun::countSprintfLength("str%-6s%08ld%08ld", multipleParams));
} }
void strncpy1() void strncpy1()