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

Fixed #6480 (False positive unreachableCode - member function exit called instead of ::exit())

This commit is contained in:
Daniel Marjamäki 2015-01-31 16:55:55 +01:00
parent 789665dadf
commit 73113c67e7
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/library.cpp
View File

@ -683,7 +683,7 @@ bool Library::isNotLibraryFunction(const Token *ftok) const
{ {
// called from tokenizer, ast is not created properly yet // called from tokenizer, ast is not created properly yet
if (Token::Match(ftok->previous(),"::|.")) if (Token::Match(ftok->previous(),"::|."))
return false; return true;
int callargs = 0; int callargs = 0;
for (const Token *tok = ftok->tokAt(2); tok && tok->str() != ")"; tok = tok->next()) { for (const Token *tok = ftok->tokAt(2); tok && tok->str() != ")"; tok = tok->next()) {

2
test/testbufferoverrun.cpp
View File

@ -2280,7 +2280,7 @@ private:
" foo::memset(str, 0, 100);\n" " foo::memset(str, 0, 100);\n"
" std::memset(str, 0, 100);\n" " std::memset(str, 0, 100);\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:5]: (error) Buffer is accessed out of bounds: str\n", errout.str()); TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Buffer is accessed out of bounds: str\n", "", errout.str());
// #5257 - check strings // #5257 - check strings
checkstd("void f() {\n" checkstd("void f() {\n"

36
test/testlibrary.cpp
View File

@ -31,7 +31,8 @@ private:
void run() { void run() {
TEST_CASE(empty); TEST_CASE(empty);
TEST_CASE(function); TEST_CASE(function);
TEST_CASE(function_match); TEST_CASE(function_match_scope);
TEST_CASE(function_match_args);
TEST_CASE(function_arg); TEST_CASE(function_arg);
TEST_CASE(function_arg_any); TEST_CASE(function_arg_any);
TEST_CASE(function_arg_valid); TEST_CASE(function_arg_valid);
@ -79,7 +80,38 @@ private:
ASSERT(library.isnotnoreturn(tokenList.front())); ASSERT(library.isnotnoreturn(tokenList.front()));
} }
void function_match() const { void function_match_scope() const {
const char xmldata[] = "<?xml version=\"1.0\"?>\n"
"<def>\n"
" <function name=\"foo\">\n"
" <arg nr=\"1\"/>"
" </function>\n"
"</def>";
tinyxml2::XMLDocument doc;
doc.Parse(xmldata, sizeof(xmldata));
{
TokenList tokenList(nullptr);
std::istringstream istr("fred.foo(123);"); // <- wrong scope, not library function
tokenList.createTokens(istr);
Library library;
library.load(doc);
ASSERT(library.isNotLibraryFunction(tokenList.front()->tokAt(2)));
}
{
TokenList tokenList(nullptr);
std::istringstream istr("Fred::foo(123);"); // <- wrong scope, not library function
tokenList.createTokens(istr);
Library library;
library.load(doc);
ASSERT(library.isNotLibraryFunction(tokenList.front()->tokAt(2)));
}
}
void function_match_args() const {
const char xmldata[] = "<?xml version=\"1.0\"?>\n" const char xmldata[] = "<?xml version=\"1.0\"?>\n"
"<def>\n" "<def>\n"
" <function name=\"foo\">\n" " <function name=\"foo\">\n"