Fix #11875: hang in hasBorrowingVariables() (#5337)

danmar · Aug 18, 2023 · 41bdd87 · 41bdd87
1 parent 74c4daa
commit 41bdd87
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -4259,10 +4259,9 @@ struct LifetimeStore {
 static bool hasBorrowingVariables(const std::list<Variable>& vars, const std::vector<const Token*>& args, int depth = 10)
 {
     if (depth < 0)
-        return false;
+        return true;
     return std::any_of(vars.cbegin(), vars.cend(), [&](const Variable& var) {
-        const ValueType* vt = var.valueType();
-        if (vt) {
+        if (const ValueType* vt = var.valueType()) {
             if (vt->pointer > 0 &&
                 std::none_of(args.begin(), args.end(), [vt](const Token* arg) {
                 return arg->valueType() && arg->valueType()->type == vt->type;

diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
@@ -7359,6 +7359,17 @@ class TestValueFlow : public TestFixture {
                "    if (llabs(0x80000000ffffffffL) == 0x7fffffff00000001L) {}\n"
                "}\n";
         valueOfTok(code, "f");
+
+        code = "struct T {\n"
+               "    T();\n"
+               "    static T a[6][64];\n"
+               "    static T b[2][64];\n"
+               "    static T c[64][64];\n"
+               "    static T d[2][64];\n"
+               "    static T e[64];\n"
+               "    static T f[64];\n"
+               "};\n";
+        valueOfTok(code, "(");
     }
 
     void valueFlowCrashConstructorInitialization() { // #9577