Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/checkbufferoverrun.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -631,9 +631,9 @@ ValueFlow::Value CheckBufferOverrunImpl::getBufferSize(const Token *bufTok, cons
if (!var || var->isPointer() || (astIsContainer(bufTok) && var->getTypeName() != "std::array"))
return ValueFlow::Value(-1);

const MathLib::bigint dim = std::accumulate(var->dimensions().cbegin(), var->dimensions().cend(), MathLib::bigint(1), [](MathLib::bigint i1, const Dimension &dim) {
return i1 * dim.num;
});
MathLib::bigint dim = 0;
if (!var->dimensionsProduct(dim))
return ValueFlow::Value(-1);

ValueFlow::Value v;
v.setKnown();
Expand Down
9 changes: 5 additions & 4 deletions lib/clangimport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
#include <string>
#include <utility>
#include <vector>
#include <numeric>

class Settings;

Expand Down Expand Up @@ -1638,9 +1637,11 @@ static void setValues(const Tokenizer &tokenizer, const SymbolDatabase *symbolDa

MathLib::bigint typeSize = 0;
for (const Variable &var: scope.varlist) {
const MathLib::bigint mul = std::accumulate(var.dimensions().cbegin(), var.dimensions().cend(), MathLib::bigint(1), [](MathLib::bigint v, const Dimension& dim) {
return v * dim.num;
});
MathLib::bigint mul = 0;
if (!var.dimensionsProduct(mul)) {
typeSize = 0;
break;
}
if (var.valueType())
typeSize += mul * var.valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
}
Expand Down
23 changes: 20 additions & 3 deletions lib/symboldatabase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
#include <iomanip>
#include <iostream>
#include <iterator>
#include <limits>
#include <numeric>
#include <sstream>
#include <stack>
Expand Down Expand Up @@ -2515,6 +2516,22 @@ bool Variable::isMember() const {
return mScope && mScope->isClassOrStructOrUnion();
}

bool Variable::dimensionsProduct(MathLib::bigint &product) const
{
const MathLib::bigint maxValue = std::numeric_limits<MathLib::bigint>::max();
const MathLib::bigint minValue = std::numeric_limits<MathLib::bigint>::min();
product = 1;
for (const Dimension &dim : mDimensions) {
const MathLib::bigint n = dim.num;
if (product > 0 && (n > 0 ? product > maxValue / n : n < minValue / product))
return false;
if (product < 0 && (n > 0 ? product < minValue / n : (n < 0 && product < maxValue / n)))
return false;
product *= n;
}
return true;
}

bool Variable::isPointerArray() const
{
if (!isArray())
Expand Down Expand Up @@ -8698,9 +8715,9 @@ static Result accumulateStructMembers(const Scope* scope, F f, ValueType::Accura
if (const ValueType* vt = var.valueType()) {
if (vt->type == ValueType::Type::RECORD && vt->typeScope == scope)
return {0, false};
const MathLib::bigint dim = std::accumulate(var.dimensions().cbegin(), var.dimensions().cend(), MathLib::bigint(1), [](MathLib::bigint i1, const Dimension& dim) {
return i1 * dim.num;
});
MathLib::bigint dim = 0;
if (!var.dimensionsProduct(dim))
return {0, false};
if (var.nameToken()->scope() != scope && var.nameToken()->scope()->definedType) { // anonymous union
const auto ret = anonScopes.insert(var.nameToken()->scope());
if (ret.second)
Expand Down
7 changes: 7 additions & 0 deletions lib/symboldatabase.h
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,13 @@ class CPPCHECKLIB Variable {
return mDimensions;
}

/**
* Get the number of array elements, the product of all dimension lengths.
* @param[out] product the number of elements
* @return false if the product does not fit in a MathLib::bigint
*/
bool dimensionsProduct(MathLib::bigint &product) const;

/**
* Get array dimension length.
* @return length of dimension
Expand Down
16 changes: 16 additions & 0 deletions test/testbufferoverrun.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ class TestBufferOverrun : public TestFixture {
TEST_CASE(minsize_strlen);
TEST_CASE(minsize_mul);
TEST_CASE(minsize_overflow);
TEST_CASE(arraysize_overflow);
TEST_CASE(unknownType);

TEST_CASE(terminateStrncpy1);
Expand Down Expand Up @@ -4990,6 +4991,21 @@ class TestBufferOverrun : public TestFixture {
ASSERT_EQUALS("[test.cpp:3:19]: (error) Buffer is accessed out of bounds: buf [bufferAccessOutOfBounds]\n", errout_str());
}

void arraysize_overflow() {
// the number of array elements must not wrap around
check("void f() {\n"
" char a[0x4000000000000001][4];\n"
" memset(a, 0, 10);\n"
"}\n", settings0);
ASSERT_EQUALS("", errout_str());

check("void f() {\n"
" char a[0x100000000][0x100000000];\n"
" memset(a, 0, 10);\n"
"}\n", settings0);
ASSERT_EQUALS("", errout_str());
}

// extracttests.enable

void unknownType() {
Expand Down
7 changes: 7 additions & 0 deletions test/testvalueflow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1864,6 +1864,13 @@ class TestValueFlow : public TestFixture {
ASSERT_EQUALS(1U, values.size());
ASSERT_EQUALS(settings.platform.sizeof_int, values.back().intvalue);
ASSERT_EQUALS_ENUM(ValueFlow::Value::ValueKind::Known, values.back().valueKind);

// the number of array elements does not fit in a MathLib::bigint
code = "struct S { char m[0x4000000000000001][4]; };\n"
"x = sizeof(S);\n";
values = tokenValues(code, "( S");
ASSERT_EQUALS(1U, values.size());
ASSERT(values.back().isImpossible());
}

void valueFlowComma()
Expand Down
Loading