diff --git a/lib/vf_common.cpp b/lib/vf_common.cpp index 9b1d0387f38..514fdb64edb 100644 --- a/lib/vf_common.cpp +++ b/lib/vf_common.cpp @@ -262,9 +262,12 @@ namespace ValueFlow } // find the number of elements size_t count = 1; - for (size_t i = 0; i < var->dimensions().size(); ++i) { - if (var->dimensionKnown(i)) - count *= var->dimension(i); + for (const Dimension& dim : var->dimensions()) { + const Value* v = dim.tok ? dim.tok->getKnownValue(Value::ValueType::INT) : nullptr; + if (dim.known) + count *= dim.num; + else if (v && v->intvalue > 0) + count *= v->intvalue; else count = 0; } diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp index 1e953af1535..0f79bc644a0 100644 --- a/test/testvalueflow.cpp +++ b/test/testvalueflow.cpp @@ -1533,6 +1533,34 @@ class TestValueFlow : public TestFixture { ASSERT_EQUALS(1U, values.size()); ASSERT_EQUALS(2, values.back().intvalue); + code = "struct S { char c[4]; };\n" + "void f() {\n" + " char a[10 + sizeof(struct S)];\n" + " x = sizeof(a);\n" + "}\n"; + values = tokenValues(code, "( a )"); + ASSERT_EQUALS(1U, values.size()); + ASSERT_EQUALS(14, values.back().intvalue); + + code = "void f() {\n" + " short s;\n" + " char a[10 + sizeof(s)];\n" + " x = sizeof(a);\n" + "}\n"; + values = tokenValues(code, "( a )"); + ASSERT_EQUALS(1U, values.size()); + ASSERT_EQUALS(12, values.back().intvalue); + + code = "struct S { char c[4]; };\n" + "struct S *p;\n" + "void f() {\n" + " char a[10 + sizeof(*p)];\n" + " x = sizeof(a);\n" + "}\n"; + values = tokenValues(code, "( a )"); + ASSERT_EQUALS(1U, values.size()); + ASSERT_EQUALS(14, values.back().intvalue); + #define CHECK(A, B, C, D) \ do { \ code = "enum " A " E " B " { E0, E1 };\n" \