Fix crash in checkConstPointer() (f'up to #12518) (#6142)

danmar · Mar 17, 2024 · 26414ff · 26414ff
1 parent 967323e
commit 26414ff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -1593,7 +1593,7 @@ void CheckOther::checkConstPointer()
                 continue;
             else if (gparent && gparent->isCast() && gparent->valueType() &&
                      ((gparent->valueType()->pointer == 0 && gparent->valueType()->reference == Reference::None) ||
-                      (var->valueType() && parent->valueType()->isConst(var->valueType()->pointer))))
+                      (var->valueType() && gparent->valueType()->isConst(var->valueType()->pointer))))
                 continue;
             else if (const Token* ftok = getTokenArgumentFunction(parent, argn)) {
                 bool inconclusive{};

diff --git a/test/testother.cpp b/test/testother.cpp
@@ -4097,6 +4097,14 @@ class TestOther : public TestFixture {
               "}\n");
         ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'src' can be declared as pointer to const\n",
                       errout_str());
+
+        check("struct S {};\n"
+              "void f(T* t) {\n"
+              "    S* s = (S*)t->p;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3]: (style) C-style pointer casting\n"
+                      "[test.cpp:3]: (style) Variable 's' can be declared as pointer to const\n",
+                      errout_str()); // don't crash
     }
 
     void switchRedundantAssignmentTest() {