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

Uninitialized variables: Fixed false positives when goto is used.

This commit is contained in:
Daniel Marjamäki 2011-12-26 16:46:10 +01:00
parent 8eb067358c
commit 025518c474
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkuninitvar.cpp
View File

@ -1182,7 +1182,7 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const unsigned int
return true; return true;
} }
if (Token::Match(tok, "return|break|continue|throw")) if (Token::Match(tok, "return|break|continue|throw|goto"))
ret = true; ret = true;
else if (ret && tok->str() == ";") else if (ret && tok->str() == ";")
return true; return true;

13
test/testuninitvar.cpp
View File

@ -1801,7 +1801,7 @@ private:
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
// return, break, continue // return, break, continue, goto
checkUninitVar2("void f() {\n" checkUninitVar2("void f() {\n"
" int x;\n" " int x;\n"
" if (y == 1) { return; }\n" " if (y == 1) { return; }\n"
@ -1820,6 +1820,17 @@ private:
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
checkUninitVar2("void f() {\n"
" int i;\n"
" if (x) {\n"
" i = 1;\n"
" } else {\n"
" goto out;\n"
" }\n"
" i++;\n"
"}");
ASSERT_EQUALS("", errout.str());
// for, while // for, while
checkUninitVar2("void f() {\n" checkUninitVar2("void f() {\n"
" int x;\n" " int x;\n"