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

Revert "Removed bailout in case a file (without include guards) is included twice. (#5455)" 

This reverts commit 34ec1112a9.
This commit is contained in:
PKEuS 2015-10-26 21:37:08 +01:00
parent 24882fb53a
commit b775603e93
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/preprocessor.cpp
View File

@ -2265,7 +2265,7 @@ void Preprocessor::handleIncludes(std::string &code, const std::string &filePath
if (start != std::string::npos) if (start != std::string::npos)
endfilePos = start; endfilePos = start;
} }
std::set<std::string> handledFiles;
while ((pos = code.find("#include", pos)) != std::string::npos) { while ((pos = code.find("#include", pos)) != std::string::npos) {
if (_settings.terminated()) if (_settings.terminated())
return; return;
@ -2306,6 +2306,14 @@ void Preprocessor::handleIncludes(std::string &code, const std::string &filePath
filename = Path::simplifyPath(filename); filename = Path::simplifyPath(filename);
std::string tempFile = filename; std::string tempFile = filename;
std::transform(tempFile.begin(), tempFile.end(), tempFile.begin(), tolowerWrapper); std::transform(tempFile.begin(), tempFile.end(), tempFile.begin(), tolowerWrapper);
if (handledFiles.find(tempFile) != handledFiles.end()) {
// We have processed this file already once, skip
// it this time to avoid eternal loop.
fin.close();
continue;
}
handledFiles.insert(tempFile);
processedFile = Preprocessor::read(fin, filename); processedFile = Preprocessor::read(fin, filename);
fin.close(); fin.close();
} }