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

bump simplecpp

This commit is contained in:
Daniel Marjamäki 2016-07-24 08:51:35 +02:00
parent 9b60b36943
commit 2bf2d1bd2a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
externals/simplecpp/simplecpp.cpp vendored
View File

@ -1124,6 +1124,10 @@ private:
if (argnr >= args.size()) if (argnr >= args.size())
return false; return false;
// empty variadic parameter
if (variadic && argnr + 1U >= parametertokens.size())
return true;
for (const Token *partok = parametertokens[argnr]->next; partok != parametertokens[argnr + 1U]; partok = partok->next) for (const Token *partok = parametertokens[argnr]->next; partok != parametertokens[argnr + 1U]; partok = partok->next)
output->push_back(new Token(*partok)); output->push_back(new Token(*partok));
@ -1136,7 +1140,8 @@ private:
const unsigned int argnr = getArgNum(tok->str); const unsigned int argnr = getArgNum(tok->str);
if (argnr >= args.size()) if (argnr >= args.size())
return false; return false;
if (variadic && argnr + 1U >= parametertokens.size()) // empty variadic parameter
return true;
for (const Token *partok = parametertokens[argnr]->next; partok != parametertokens[argnr + 1U];) { for (const Token *partok = parametertokens[argnr]->next; partok != parametertokens[argnr + 1U];) {
const std::map<TokenString, Macro>::const_iterator it = macros.find(partok->str); const std::map<TokenString, Macro>::const_iterator it = macros.find(partok->str);
if (it != macros.end() && expandedmacros1.find(partok->str) == expandedmacros1.end()) if (it != macros.end() && expandedmacros1.find(partok->str) == expandedmacros1.end())