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

Preprocessor: Fix hang

This commit is contained in:
Daniel Marjamäki 2013-01-26 19:11:58 +01:00
parent 9313f7aa79
commit 6238db3a78
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/preprocessor.cpp
View File

@ -993,7 +993,7 @@ std::string Preprocessor::getdef(std::string line, bool def)
} }
/** Simplify variable in variable map. */ /** Simplify variable in variable map. */
static void simplifyVarMapExpandValue(Token *tok, const std::map<std::string, std::string> &variables, std::set<std::string> seenVariables) static void simplifyVarMapExpandValue(Token *tok, const std::map<std::string, std::string> &variables, std::set<std::string> &seenVariables)
{ {
// TODO: handle function-macros too. // TODO: handle function-macros too.
@ -1033,12 +1033,13 @@ static void simplifyVarMapExpandValue(Token *tok, const std::map<std::string, st
static void simplifyVarMap(std::map<std::string, std::string> &variables) static void simplifyVarMap(std::map<std::string, std::string> &variables)
{ {
for (std::map<std::string, std::string>::iterator i = variables.begin(); i != variables.end(); ++i) { for (std::map<std::string, std::string>::iterator i = variables.begin(); i != variables.end(); ++i) {
std::set<std::string> seenVariables;
TokenList tokenList(NULL); TokenList tokenList(NULL);
std::istringstream istr(i->second); std::istringstream istr(i->second);
if (tokenList.createTokens(istr)) { if (tokenList.createTokens(istr)) {
for (Token *tok = tokenList.front(); tok; tok = tok->next()) { for (Token *tok = tokenList.front(); tok; tok = tok->next()) {
if (tok->isName()) { if (tok->isName()) {
std::set<std::string> seenVariables;
simplifyVarMapExpandValue(tok, variables, seenVariables); simplifyVarMapExpandValue(tok, variables, seenVariables);
} }
} }
@ -1937,6 +1938,12 @@ std::string Preprocessor::handleIncludes(const std::string &code, const std::str
std::set<std::string> undefs = _settings ? _settings->userUndefs : std::set<std::string>(); std::set<std::string> undefs = _settings ? _settings->userUndefs : std::set<std::string>();
if (_errorLogger)
_errorLogger->reportProgress(filePath, "Preprocessor (handleIncludes)", 0);
if (_settings && _settings->terminated())
return "";
std::ostringstream ostr; std::ostringstream ostr;
std::istringstream istr(code); std::istringstream istr(code);
std::string line; std::string line;