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

try to fix memleak in simplecpp

This commit is contained in:
Daniel Marjamäki 2016-07-25 21:33:06 +02:00
parent 045116f797
commit dd766d477d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
externals/simplecpp/simplecpp.cpp vendored
View File

@ -1377,11 +1377,11 @@ std::string openHeader(std::ifstream &f, const simplecpp::DUI &dui, const std::s
std::string getFileName(const std::map<std::string, simplecpp::TokenList *> &filedata, const std::string &sourcefile, const std::string &header, const simplecpp::DUI &dui, bool systemheader) { std::string getFileName(const std::map<std::string, simplecpp::TokenList *> &filedata, const std::string &sourcefile, const std::string &header, const simplecpp::DUI &dui, bool systemheader) {
if (!systemheader) { if (!systemheader) {
if (sourcefile.find_first_of("\\/") != std::string::npos) { if (sourcefile.find_first_of("\\/") != std::string::npos) {
const std::string s = sourcefile.substr(0, sourcefile.find_last_of("\\/") + 1U) + header; const std::string s(simplecpp::simplifyPath(sourcefile.substr(0, sourcefile.find_last_of("\\/") + 1U) + header));
if (filedata.find(s) != filedata.end()) if (filedata.find(s) != filedata.end())
return simplecpp::simplifyPath(s); return s;
} else { } else {
if (filedata.find(header) != filedata.end()) if (filedata.find(simplecpp::simplifyPath(header)) != filedata.end())
return simplecpp::simplifyPath(header); return simplecpp::simplifyPath(header);
} }
} }
@ -1391,8 +1391,9 @@ std::string getFileName(const std::map<std::string, simplecpp::TokenList *> &fil
if (!s.empty() && s[s.size()-1U]!='/' && s[s.size()-1U]!='\\') if (!s.empty() && s[s.size()-1U]!='/' && s[s.size()-1U]!='\\')
s += '/'; s += '/';
s += header; s += header;
s = simplecpp::simplifyPath(s);
if (filedata.find(s) != filedata.end()) if (filedata.find(s) != filedata.end())
return simplecpp::simplifyPath(s); return s;
} }
return ""; return "";
@ -1443,6 +1444,9 @@ std::map<std::string, simplecpp::TokenList*> simplecpp::load(const simplecpp::To
TokenList *tokens = new TokenList(f, fileNumbers, header2, outputList); TokenList *tokens = new TokenList(f, fileNumbers, header2, outputList);
ret[header2] = tokens; ret[header2] = tokens;
//std::cout << "new " << (void*)tokens << ' ' << header2 << std::endl;
if (tokens->cbegin()) if (tokens->cbegin())
filelist.push_back(tokens->cbegin()); filelist.push_back(tokens->cbegin());
} }