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

Fixed #7907 (FN: redundant assignment inside switchcase, overwritten by assignment outside of switch)

This commit is contained in:
Daniel Marjamäki 2018-12-17 16:10:43 +01:00
parent 4558fd5a2c
commit fe38e256cc
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkother.cpp
View File

@ -494,6 +494,8 @@ void CheckOther::checkRedundantAssignment()
// there is redundant assignment. Is there a case between the assignments? // there is redundant assignment. Is there a case between the assignments?
bool hasCase = false; bool hasCase = false;
for (const Token *tok2 = tok; tok2 != nextAssign; tok2 = tok2->next()) { for (const Token *tok2 = tok; tok2 != nextAssign; tok2 = tok2->next()) {
if (tok2->str() == "break" || tok2->str() == "return")
break;
if (tok2->str() == "case") { if (tok2->str() == "case") {
hasCase = true; hasCase = true;
break; break;

21
test/testother.cpp
View File

@ -2284,6 +2284,27 @@ private:
" bar(y);\n" " bar(y);\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:10]: (warning) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing?\n", errout.str()); ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:10]: (warning) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing?\n", errout.str());
check("bool f() {\n"
" bool ret = false;\n"
" switch (switchCond) {\n"
" case 1:\n"
" ret = true;\n"
" break;\n"
" case 31:\n"
" ret = true;\n"
" break;\n"
" case 54:\n"
" ret = true;\n"
" break;\n"
" };\n"
" ret = true;\n"
" return ret;\n"
"}");
ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:14]: (style) Variable 'ret' is reassigned a value before the old one has been used.\n"
"[test.cpp:8] -> [test.cpp:14]: (style) Variable 'ret' is reassigned a value before the old one has been used.\n"
"[test.cpp:11] -> [test.cpp:14]: (style) Variable 'ret' is reassigned a value before the old one has been used.\n",
errout.str());
} }
void switchRedundantBitwiseOperationTest() { void switchRedundantBitwiseOperationTest() {