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

Uninitvar: Reactivated the checking

This commit is contained in:
Daniel Marjamäki 2011-11-30 18:57:52 +01:00
parent ca9dbfc031
commit 414e0ecc3c
3 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/checkuninitvar.cpp
View File

@ -27,8 +27,7 @@
// Register this check class (by creating a static instance of it)
namespace {
// The ExecutionPath framework doesn't work as well as I wanted
//CheckUninitVar instance;
CheckUninitVar instance;
}
//---------------------------------------------------------------------------
@ -1019,9 +1018,6 @@ void CheckUninitVar::saveAnalysisData(const std::set<std::string> &data) const
void CheckUninitVar::executionPaths()
{
if (!_settings->experimental)
return;
// check if variable is accessed uninitialized..
{
// no writing if multiple threads are used (TODO: thread safe analysis?)

61
test/testsuppressions.cpp
View File

@ -157,7 +157,6 @@ private:
Settings settings;
settings._inlineSuppressions = true;
settings.experimental = true;
if (!suppression.empty())
settings.nomsg.addSuppressionLine(suppression);
@ -172,16 +171,18 @@ private:
void runChecks(void (TestSuppressions::*check)(const char[], const std::string &)) {
// check to make sure the appropriate error is present
(this->*check)("void f() {\n"
" int a = 4 / 0;\n"
" int a;\n"
" a++;\n"
"}\n",
"");
ASSERT_EQUALS("[test.cpp:2]: (error) Division by zero\n", errout.str());
ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
// suppress uninitvar globally
(this->*check)("void f() {\n"
" int a = 4 / 0;\n"
" int a;\n"
" a++;\n"
"}\n",
"zerodiv");
"uninitvar");
ASSERT_EQUALS("", errout.str());
// suppress uninitvar globally, without error present
@ -189,15 +190,15 @@ private:
" int a;\n"
" b++;\n"
"}\n",
"zerodiv");
ASSERT_EQUALS("[*]: (information) Unmatched suppression: zerodiv\n", errout.str());
"uninitvar");
ASSERT_EQUALS("[*]: (information) Unmatched suppression: uninitvar\n", errout.str());
// suppress uninitvar for this file only
(this->*check)("void f() {\n"
" int a = 4 / 0;\n"
" int a;\n"
" a++;\n"
"}\n",
"zerodiv:test.cpp");
"uninitvar:test.cpp");
ASSERT_EQUALS("", errout.str());
// suppress uninitvar for this file only, without error present
@ -205,13 +206,13 @@ private:
" int a;\n"
" b++;\n"
"}\n",
"zerodiv:test.cpp");
ASSERT_EQUALS("[test.cpp]: (information) Unmatched suppression: zerodiv\n", errout.str());
"uninitvar:test.cpp");
ASSERT_EQUALS("[test.cpp]: (information) Unmatched suppression: uninitvar\n", errout.str());
// suppress all for this file only
(this->*check)("void f() {\n"
" int a;\n"
" a = 4 / 0;\n"
" a++;\n"
"}\n",
"*:test.cpp");
ASSERT_EQUALS("", errout.str());
@ -227,24 +228,24 @@ private:
// suppress uninitvar for this file and line
(this->*check)("void f() {\n"
" int a;\n"
" a = 4 / 0;\n"
" a++;\n"
"}\n",
"zerodiv:test.cpp:3");
"uninitvar:test.cpp:3");
ASSERT_EQUALS("", errout.str());
// suppress uninitvar for this file and line, without error present
(this->*check)("void f() {\n"
" int a;\n"
" a = 4;\n"
" b++;\n"
"}\n",
"zerodiv:test.cpp:3");
ASSERT_EQUALS("[test.cpp:3]: (information) Unmatched suppression: zerodiv\n", errout.str());
"uninitvar:test.cpp:3");
ASSERT_EQUALS("[test.cpp:3]: (information) Unmatched suppression: uninitvar\n", errout.str());
// suppress uninitvar inline
(this->*check)("void f() {\n"
" int a;\n"
" // cppcheck-suppress zerodiv\n"
" a = 4 / 0;\n"
" // cppcheck-suppress uninitvar\n"
" a++;\n"
"}\n",
"");
ASSERT_EQUALS("", errout.str());
@ -252,9 +253,9 @@ private:
// suppress uninitvar inline
(this->*check)("void f() {\n"
" int a;\n"
" // cppcheck-suppress zerodiv\n"
" // cppcheck-suppress uninitvar\n"
"\n"
" a = 4 / 0;\n"
" a++;\n"
"}\n",
"");
ASSERT_EQUALS("", errout.str());
@ -262,8 +263,8 @@ private:
// suppress uninitvar inline
(this->*check)("void f() {\n"
" int a;\n"
" /* cppcheck-suppress zerodiv */\n"
" a = 4 / 0;\n"
" /* cppcheck-suppress uninitvar */\n"
" a++;\n"
"}\n",
"");
ASSERT_EQUALS("", errout.str());
@ -271,9 +272,9 @@ private:
// suppress uninitvar inline
(this->*check)("void f() {\n"
" int a;\n"
" /* cppcheck-suppress zerodiv */\n"
" /* cppcheck-suppress uninitvar */\n"
"\n"
" a = 4 / 0;\n"
" a++;\n"
"}\n",
"");
ASSERT_EQUALS("", errout.str());
@ -281,11 +282,11 @@ private:
// suppress uninitvar inline, without error present
(this->*check)("void f() {\n"
" int a;\n"
" // cppcheck-suppress zerodiv\n"
" a = 4;\n"
" // cppcheck-suppress uninitvar\n"
" b++;\n"
"}\n",
"");
ASSERT_EQUALS("[test.cpp:4]: (information) Unmatched suppression: zerodiv\n", errout.str());
ASSERT_EQUALS("[test.cpp:4]: (information) Unmatched suppression: uninitvar\n", errout.str());
}
void suppressionsSettings() {
@ -301,12 +302,12 @@ private:
"}\n",
"void f() {\n"
" int a;\n"
" a = 4 / 0;\n"
" a++;\n"
"}\n",
};
// suppress uninitvar for this file and line
checkSuppression(names, codes, "zerodiv:xyz.cpp:3");
checkSuppression(names, codes, "uninitvar:xyz.cpp:3");
ASSERT_EQUALS("", errout.str());
}

1
test/testuninitvar.cpp
View File

@ -55,7 +55,6 @@ private:
errout.str("");
Settings settings;
settings.experimental = true;
// Tokenize..
Tokenizer tokenizer(&settings, this);