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

Merge overlapping patterns

This commit is contained in:
Dmitry-Me 2015-09-01 16:17:17 +03:00
parent e683d31e71
commit 139ead15ef
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/checkbufferoverrun.cpp
View File

@ -674,23 +674,25 @@ void CheckBufferOverrun::checkScope(const Token *tok, const std::vector<std::str
if (total_size > 0) { if (total_size > 0) {
// Writing data into array.. // Writing data into array..
if ((declarationId > 0 && Token::Match(tok, "strcpy|strcat ( %varid% , %str% )", declarationId)) || if ((declarationId > 0 && Token::Match(tok, "strcpy|strcat ( %varid% , %str%|%var% )", declarationId)) ||
(declarationId == 0 && Token::Match(tok, ("strcpy|strcat ( " + varnames + " , %str% )").c_str()))) { (declarationId == 0 && Token::Match(tok, ("strcpy|strcat ( " + varnames + " , %str%|%var% )").c_str()))) {
const std::size_t len = Token::getStrLength(tok->tokAt(varcount + 4)); const Token* lastParamTok = tok->tokAt(varcount + 4);
if (len >= (unsigned int)total_size) { if (lastParamTok->tokType() == Token::Type::eString) {
bufferOverrunError(tok, declarationId > 0 ? emptyString : varnames); const std::size_t len = Token::getStrLength(lastParamTok);
continue; if (len >= (unsigned int)total_size) {
} bufferOverrunError(tok, declarationId > 0 ? emptyString : varnames);
} else if ((declarationId > 0 && Token::Match(tok, "strcpy|strcat ( %varid% , %var% )", declarationId)) ||
(declarationId == 0 && Token::Match(tok, ("strcpy|strcat ( " + varnames + " , %var% )").c_str()))) {
const Variable *var = tok->tokAt(varcount + 4)->variable();
if (var && var->isArray() && var->dimensions().size() == 1) {
const MathLib::bigint len = var->dimension(0);
if (len > total_size) {
if (printInconclusive)
possibleBufferOverrunError(tok, tok->strAt(4), tok->strAt(2), tok->str() == "strcat");
continue; continue;
} }
} else {
const Variable *var = lastParamTok->variable();
if (var && var->isArray() && var->dimensions().size() == 1) {
const MathLib::bigint len = var->dimension(0);
if (len > total_size) {
if (printInconclusive)
possibleBufferOverrunError(tok, tok->strAt(4), tok->strAt(2), tok->str() == "strcat");
continue;
}
}
} }
} }