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

Preprocessor: fix bug when determining location when there is a missing include. ticket: #2326

This commit is contained in:
Daniel Marjamäki 2011-01-07 19:48:51 +01:00
parent 5f078da7ad
commit 989e0e7ccb
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/preprocessor.cpp
View File

@ -1605,8 +1605,10 @@ void Preprocessor::handleIncludes(std::string &code, const std::string &filePath
if (_errorLogger && _settings && _settings->isEnabled("missingInclude")) if (_errorLogger && _settings && _settings->isEnabled("missingInclude"))
#endif #endif
{ {
std::string f = filePath;
// Determine line number of include // Determine line number of include
unsigned int linenr = 1; unsigned int linenr = 0;
unsigned int level = 0; unsigned int level = 0;
for (std::string::size_type p = 1; p <= pos; ++p) for (std::string::size_type p = 1; p <= pos; ++p)
{ {
@ -1620,13 +1622,16 @@ void Preprocessor::handleIncludes(std::string &code, const std::string &filePath
{ {
if (level == 0) if (level == 0)
{ {
const std::string::size_type pos1 = pos - p + 7;
const std::string::size_type pos2 = code.find_first_of("\"\n", pos1);
f = code.substr(pos1, (pos2 == std::string::npos) ? pos2 : (pos2 - pos1));
break; break;
} }
--level; --level;
} }
} }
missingInclude(Path::toNativeSeparators(filePath), missingInclude(Path::toNativeSeparators(f),
linenr, linenr,
filename, filename,
headerType == UserHeader); headerType == UserHeader);