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

fix more daca simplifyUsing hangs (#3152)

This commit is contained in:
IOBYTE 2021-02-26 12:30:17 -05:00 committed by GitHub
parent c3eb37972d
commit bc8eb164a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/tokenize.cpp
View File

@ -1884,8 +1884,9 @@ namespace {
if (scope->bodyStart == bodyStart) if (scope->bodyStart == bodyStart)
return this; return this;
for (auto & child : children) { for (auto & child : children) {
if (child.findScope(scope)) ScopeInfo3 * temp = child.findScope(scope);
return &child; if (temp)
return temp;
} }
return nullptr; return nullptr;
} }
@ -2029,7 +2030,8 @@ namespace {
const std::string &scope, const std::string &scope,
Token **tok, Token **tok,
const std::string &scope1, const std::string &scope1,
const ScopeInfo3 *scopeInfo) const ScopeInfo3 *currentScope,
const ScopeInfo3 *memberClassScope)
{ {
Token *tok1 = *tok; Token *tok1 = *tok;
@ -2046,8 +2048,8 @@ namespace {
if (tok1->strAt(-1) == "using") { if (tok1->strAt(-1) == "using") {
// fixme: this is wrong // fixme: this is wrong
// skip to end of scope // skip to end of scope
if (scopeInfo->bodyEnd) if (currentScope->bodyEnd)
*tok = scopeInfo->bodyEnd->previous(); *tok = currentScope->bodyEnd->previous();
return false; return false;
} }
@ -2092,6 +2094,8 @@ namespace {
if (scope == fullScope1) if (scope == fullScope1)
return true; return true;
const ScopeInfo3 *scopeInfo = memberClassScope ? memberClassScope : currentScope;
// check in base types // check in base types
if (scopeInfo->findTypeInBase(scope)) if (scopeInfo->findTypeInBase(scope))
return true; return true;
@ -2225,6 +2229,7 @@ bool Tokenizer::simplifyUsing()
if (Token::Match(tok, "{|}|namespace|class|struct|union") || if (Token::Match(tok, "{|}|namespace|class|struct|union") ||
Token::Match(tok, "using namespace %name% ;|::")) { Token::Match(tok, "using namespace %name% ;|::")) {
setScopeInfo(tok, &currentScope); setScopeInfo(tok, &currentScope);
continue;
} }
// skip template declarations // skip template declarations
@ -2325,6 +2330,9 @@ bool Tokenizer::simplifyUsing()
temp->deleteThis(); temp->deleteThis();
} }
if (usingEnd)
tok = usingEnd;
// Unfortunately we have to start searching from the beginning // Unfortunately we have to start searching from the beginning
// of the token stream because templates are instantiated at // of the token stream because templates are instantiated at
// the end of the token stream and it may be used before then. // the end of the token stream and it may be used before then.
@ -2341,10 +2349,10 @@ bool Tokenizer::simplifyUsing()
if (currentScope->type == ScopeInfo3::Other || if (currentScope->type == ScopeInfo3::Other ||
currentScope->type == ScopeInfo3::MemberFunction) { currentScope->type == ScopeInfo3::MemberFunction) {
scopeInfo1 = scopeInfo; scopeInfo1 = scopeInfo;
currentScope1 = scopeInfo.findScope(currentScope); currentScope1 = scopeInfo1.findScope(currentScope);
if (!currentScope1) if (!currentScope1)
return substitute; // something bad happened return substitute; // something bad happened
startToken = usingEnd; startToken = usingEnd->next();
endToken = currentScope->bodyEnd->next(); endToken = currentScope->bodyEnd->next();
if (currentScope->type == ScopeInfo3::MemberFunction) { if (currentScope->type == ScopeInfo3::MemberFunction) {
const ScopeInfo3 * temp = currentScope->findScope(currentScope->fullName); const ScopeInfo3 * temp = currentScope->findScope(currentScope->fullName);
@ -2356,7 +2364,7 @@ bool Tokenizer::simplifyUsing()
} }
} }
std::string scope1; std::string scope1 = currentScope1->fullName;
bool skip = false; // don't erase type aliases we can't parse bool skip = false; // don't erase type aliases we can't parse
for (Token* tok1 = startToken; !skip && tok1 && tok1 != endToken; tok1 = tok1->next()) { for (Token* tok1 = startToken; !skip && tok1 && tok1 != endToken; tok1 = tok1->next()) {
if ((Token::Match(tok1, "{|}|namespace|class|struct|union") && tok1->strAt(-1) != "using") || if ((Token::Match(tok1, "{|}|namespace|class|struct|union") && tok1->strAt(-1) != "using") ||
@ -2402,9 +2410,9 @@ bool Tokenizer::simplifyUsing()
} }
continue; continue;
} else if (inMemberFunc && memberFuncScope) { } else if (inMemberFunc && memberFuncScope) {
if (!usingMatch(nameToken, scope, &tok1, scope1, memberFuncScope)) if (!usingMatch(nameToken, scope, &tok1, scope1, currentScope1, memberFuncScope))
continue; continue;
} else if (!usingMatch(nameToken, scope, &tok1, scope1, currentScope1)) } else if (!usingMatch(nameToken, scope, &tok1, scope1, currentScope1, nullptr))
continue; continue;
// remove the qualification // remove the qualification