Another fix for #12393 Stack overflow in accumulateStructMembers() (cppcheck-opensource#5934)

chrchr-github · web-flow · commit 998ffe3c603a · 2024-02-02T11:12:31.000+01:00
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -1139,7 +1139,7 @@ static size_t bitCeil(size_t x)
 
 static size_t getAlignOf(const ValueType& vt, const Settings& settings)
 {
-    if (vt.pointer || vt.isPrimitive()) {
+    if (vt.pointer || vt.reference != Reference::None || vt.isPrimitive()) {
         auto align = ValueFlow::getSizeOf(vt, settings);
         return align == 0 ? 0 : bitCeil(align);
     }
@@ -1161,7 +1161,7 @@ static nonneg int getSizeOfType(const Token *typeTok, const Settings &settings)
 
 size_t ValueFlow::getSizeOf(const ValueType &vt, const Settings &settings)
 {
-    if (vt.pointer)
+    if (vt.pointer || vt.reference != Reference::None)
         return settings.platform.sizeof_pointer;
     if (vt.type == ValueType::Type::BOOL || vt.type == ValueType::Type::CHAR)
         return 1;
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
@@ -1448,6 +1448,16 @@ class TestValueFlow : public TestFixture {
         values = tokenValues(code, "( X )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(12, values.back().intvalue);
+
+        code = "struct T;\n"
+               "struct S { T& r; };\n"
+               "struct T { S s{ *this }; };\n"
+               "void f() {\n"
+               "    sizeof(T) == sizeof(void*);\n"
+               "}\n";
+        values = tokenValues(code, "==");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(1LL, values.back().intvalue);
     }
 
     void valueFlowComma()

Original file line number	Diff line number	Diff line change
`@@ -1139,7 +1139,7 @@ static size_t bitCeil(size_t x)`
`1139`	`1139`
`1140`	`1140`	`static size_t getAlignOf(const ValueType& vt, const Settings& settings)`
`1141`	`1141`	`{`
`1142`		`- if (vt.pointer \|\| vt.isPrimitive()) {`
	`1142`	`+ if (vt.pointer \|\| vt.reference != Reference::None \|\| vt.isPrimitive()) {`
`1143`	`1143`	`auto align = ValueFlow::getSizeOf(vt, settings);`
`1144`	`1144`	`return align == 0 ? 0 : bitCeil(align);`
`1145`	`1145`	`}`
`@@ -1161,7 +1161,7 @@ static nonneg int getSizeOfType(const Token *typeTok, const Settings &settings)`
`1161`	`1161`
`1162`	`1162`	`size_t ValueFlow::getSizeOf(const ValueType &vt, const Settings &settings)`
`1163`	`1163`	`{`
`1164`		`- if (vt.pointer)`
	`1164`	`+ if (vt.pointer \|\| vt.reference != Reference::None)`
`1165`	`1165`	`return settings.platform.sizeof_pointer;`
`1166`	`1166`	`if (vt.type == ValueType::Type::BOOL \|\| vt.type == ValueType::Type::CHAR)`
`1167`	`1167`	`return 1;`