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

Buffer overrun: Refactorings; use range for loops and write in message

This commit is contained in:
Daniel Marjamäki 2019-03-09 22:19:09 +01:00
parent 4ce6de39c5
commit 3eb5de756c
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/checkbufferoverrun.cpp
View File

@ -63,7 +63,7 @@ static const CWE CWE788(788U); // Access of Memory Location After End of Buffer
static void makeArrayIndexOutOfBoundsError(std::ostream& oss, const CheckBufferOverrun::ArrayInfo &arrayInfo, const std::vector<MathLib::bigint> &index) static void makeArrayIndexOutOfBoundsError(std::ostream& oss, const CheckBufferOverrun::ArrayInfo &arrayInfo, const std::vector<MathLib::bigint> &index)
{ {
oss << "$symbol:" << arrayInfo.varname() << '\n'; oss << "$symbol:" << arrayInfo.varname() << '\n';
oss << "Array '" << arrayInfo.varname(); oss << "Array '$symbol";
for (std::size_t i = 0; i < arrayInfo.num().size(); ++i) for (std::size_t i = 0; i < arrayInfo.num().size(); ++i)
oss << "[" << arrayInfo.num(i) << "]"; oss << "[" << arrayInfo.num(i) << "]";
if (index.size() == 1) if (index.size() == 1)
@ -1343,15 +1343,12 @@ void CheckBufferOverrun::checkStructVariable()
{ {
// find every class and struct // find every class and struct
const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase(); const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
const std::size_t classes = symbolDatabase->classAndStructScopes.size(); for (const Scope * scope : symbolDatabase->classAndStructScopes) {
for (std::size_t i = 0; i < classes; ++i) { for (const Variable &var : scope->varlist) {
const Scope * scope = symbolDatabase->classAndStructScopes[i]; if (!var.isArray())
for (std::list<Variable>::const_iterator var = scope->varlist.begin(); var != scope->varlist.end(); ++var) {
if (!var->isArray())
continue; continue;
// create ArrayInfo from the array variable // create ArrayInfo from the array variable
ArrayInfo arrayInfo(&*var, symbolDatabase); ArrayInfo arrayInfo(&var, symbolDatabase);
// find every function // find every function
for (const Scope * func_scope : symbolDatabase->functionScopes) { for (const Scope * func_scope : symbolDatabase->functionScopes) {
@ -1403,10 +1400,10 @@ void CheckBufferOverrun::checkStructVariable()
continue; continue;
// check for variable sized structure // check for variable sized structure
if (scope->type == Scope::eStruct && var->isPublic()) { if (scope->type == Scope::eStruct && var.isPublic()) {
// last member of a struct with array size of 0 or 1 could be a variable sized structure // last member of a struct with array size of 0 or 1 could be a variable sized structure
if (var->dimensions().size() == 1 && var->dimension(0) < 2 && if (var.dimensions().size() == 1 && var.dimension(0) < 2 &&
var->index() == (scope->varlist.size() - 1)) { var.index() == (scope->varlist.size() - 1)) {
// dynamically allocated so could be variable sized structure // dynamically allocated so could be variable sized structure
if (tok3->next()->str() == "*") { if (tok3->next()->str() == "*") {
// check for allocation // check for allocation