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

Fix crash in SymbolDatabase - errorLogger may be 0

This commit is contained in:
Alexander Mai 2014-04-18 21:19:49 +02:00
parent aecb072fc6
commit 96d2666a6c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/symboldatabase.cpp
View File

@ -48,9 +48,10 @@ SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *setti
// find all scopes // find all scopes
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok ? tok->next() : nullptr) { for (const Token *tok = _tokenizer->tokens(); tok; tok = tok ? tok->next() : nullptr) {
// #5593 suggested to add here: // #5593 suggested to add here:
_errorLogger->reportProgress(_tokenizer->getSourceFilePath(), if (_errorLogger)
"SymbolDatabase", _errorLogger->reportProgress(_tokenizer->getSourceFilePath(),
tok->progressValue()); "SymbolDatabase",
tok->progressValue());
// Locate next class // Locate next class
if (Token::Match(tok, "class|struct|union|namespace ::| %var% {|:|::") && if (Token::Match(tok, "class|struct|union|namespace ::| %var% {|:|::") &&
tok->strAt(-1) != "friend") { tok->strAt(-1) != "friend") {