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

Fix #1453 (possible infinite loop processing GNU Go's engine/montecarlo.c) 

http://sourceforge.net/apps/trac/cppcheck/ticket/1453
This commit is contained in:
Reijo Tomperi 2010-02-27 23:47:56 +02:00
parent 69d6453ea8
commit 88840e6a08
2 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/checkbufferoverrun.cpp
View File

@ -149,6 +149,33 @@ void CheckBufferOverrun::terminateStrncpyError(const Token *tok)
// Check array usage..
//---------------------------------------------------------------------------
/**
* @brief This is a helper class to be used with std::find_if
*/
class TokenStrEquals
{
public:
/**
* @param str Token::str() is compared against this.
*/
TokenStrEquals(const std::string &str)
: value(str)
{
}
/**
* Called automatically by std::find_if
* @param tok Token inside the list
*/
bool operator()(const Token *tok) const
{
return value == tok->str();
}
private:
const std::string value;
};
void CheckBufferOverrun::checkScope(const Token *tok, const std::vector<std::string> &varname, const int size, const int total_size, unsigned int varid)
{
std::string varnames;
@ -732,7 +759,7 @@ void CheckBufferOverrun::checkScope(const Token *tok, const std::vector<std::str
ftok = ftok ? ftok->next() : 0;
// Don't make recursive checking..
if (std::find(_callStack.begin(), _callStack.end(), tok1) != _callStack.end())
if (std::find_if(_callStack.begin(), _callStack.end(), TokenStrEquals(tok1->str())) != _callStack.end())
continue;
// Check variable usage in the function..

31
test/testbufferoverrun.cpp
View File

@ -143,6 +143,7 @@ private:
TEST_CASE(terminateStrncpy1);
TEST_CASE(terminateStrncpy2);
TEST_CASE(recursive_long_time);
}
@ -1622,8 +1623,34 @@ private:
ASSERT_EQUALS("[test.cpp:4]: (style) After a strncpy() the buffer should be zero-terminated\n", errout.str());
}
void recursive_long_time()
{
// Just test that recursive check doesn't take long time
check("char *f2 ( char *b )\n"
"{\n"
" f2( b );\n"
" f2( b );\n"
" f2( b );\n"
" f2( b );\n"
" f2( b );\n"
" f2( b );\n"
" f2( b );\n"
" f2( b );\n"
" f2( b );\n"
" f2( b );\n"
" f2( b );\n"
" f2( b );\n"
" f2( b );\n"
" f2( b );\n"
" f2( b );\n"
"}\n"
"void f()\n"
"{\n"
" char a[10];\n"
" f2(a);\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}
};
REGISTER_TEST(TestBufferOverrun)