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

Fixed #6190 (SymbolDatabase: variable info not set properly when reinterpret_cast is used)

This commit is contained in:
Daniel Marjamäki 2014-10-12 16:06:50 +02:00
parent 11867e3210
commit 77cffcde38
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/symboldatabase.cpp
View File

@ -2695,6 +2695,9 @@ bool Scope::isVariableDeclaration(const Token* tok, const Token*& vartok, const
const Token* localVarTok = nullptr; const Token* localVarTok = nullptr;
if (Token::Match(localTypeTok, "%type% <")) { if (Token::Match(localTypeTok, "%type% <")) {
if (Token::Match(tok, "const_cast|dynamic_cast|reinterpret_cast|static_cast <"))
return false;
const Token* closeTok = localTypeTok->next()->link(); const Token* closeTok = localTypeTok->next()->link();
if (closeTok) { if (closeTok) {
localVarTok = skipPointers(closeTok->next()); localVarTok = skipPointers(closeTok->next());

8
test/testsymboldatabase.cpp
View File

@ -128,6 +128,7 @@ private:
TEST_CASE(isVariableDeclarationIdentifiesNestedTemplateVariable); TEST_CASE(isVariableDeclarationIdentifiesNestedTemplateVariable);
TEST_CASE(isVariableDeclarationIdentifiesReference); TEST_CASE(isVariableDeclarationIdentifiesReference);
TEST_CASE(isVariableDeclarationDoesNotIdentifyTemplateClass); TEST_CASE(isVariableDeclarationDoesNotIdentifyTemplateClass);
TEST_CASE(isVariableDeclarationDoesNotIdentifyCppCast);
TEST_CASE(isVariableDeclarationPointerConst); TEST_CASE(isVariableDeclarationPointerConst);
TEST_CASE(isVariableDeclarationRValueRef); TEST_CASE(isVariableDeclarationRValueRef);
TEST_CASE(isVariableStlType); TEST_CASE(isVariableStlType);
@ -603,6 +604,13 @@ private:
ASSERT_EQUALS(false, result); ASSERT_EQUALS(false, result);
} }
void isVariableDeclarationDoesNotIdentifyCppCast() {
reset();
givenACodeSampleToTokenize var("reinterpret_cast <char *> (code)[0] = 0;");
bool result = si.isVariableDeclaration(var.tokens(), vartok, typetok);
ASSERT_EQUALS(false, result);
}
void isVariableDeclarationPointerConst() { void isVariableDeclarationPointerConst() {
reset(); reset();
givenACodeSampleToTokenize var("std::string const* s;"); givenACodeSampleToTokenize var("std::string const* s;");