From 77bfec43172bf633141b3bafa9f5380bc03de2d3 Mon Sep 17 00:00:00 2001
From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
Date: Sat, 28 Oct 2023 16:48:39 +0200
Subject: [PATCH] Fix #12119 FN constVariablePointer with reassigned pointer
 (#5592)

---
 lib/astutils.cpp    |  5 +++--
 lib/checkother.cpp  |  2 ++
 lib/clangimport.cpp |  2 +-
 lib/tokenlist.cpp   |  2 +-
 test/cfg/gtk.c      |  2 +-
 test/testother.cpp  | 13 +++++++------
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/astutils.cpp b/lib/astutils.cpp
index 34ec31e6c..64c5a74a3 100644
--- a/lib/astutils.cpp
+++ b/lib/astutils.cpp
@@ -2543,11 +2543,12 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
     tok2 = skipRedundantPtrOp(tok2, tok2->astParent());
 
     if (tok2->astParent() && tok2->astParent()->isAssignmentOp()) {
-        if (tok2 == tok2->astParent()->astOperand1())
+        if ((indirect == 0 || tok2 != tok) && tok2 == tok2->astParent()->astOperand1())
             return true;
         // Check if assigning to a non-const lvalue
         const Variable * var = getLHSVariable(tok2->astParent());
-        if (var && var->isReference() && !var->isConst() && var->nameToken() && var->nameToken()->next() == tok2->astParent()) {
+        if (var && var->isReference() && !var->isConst() &&
+            ((var->nameToken() && var->nameToken()->next() == tok2->astParent()) || var->isPointer())) {
             if (!var->isLocal() || isVariableChanged(var, settings, cpp, depth - 1))
                 return true;
         }
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
index d937e625b..418c9f06b 100644
--- a/lib/checkother.cpp
+++ b/lib/checkother.cpp
@@ -1705,6 +1705,8 @@ void CheckOther::checkConstPointer()
                 continue;
             if (p->isArgument() && p->typeStartToken() && p->typeStartToken()->isSimplifiedTypedef() && !(Token::simpleMatch(p->typeEndToken(), "*") && !p->typeEndToken()->isSimplifiedTypedef()))
                 continue;
+            if (p->typeStartToken() && !p->typeStartToken()->originalName().empty())
+                continue;
             constVariableError(p, p->isArgument() ? p->scope()->function : nullptr);
         }
     }
diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
index b4bba09cd..805741fd0 100644
--- a/lib/clangimport.cpp
+++ b/lib/clangimport.cpp
@@ -992,7 +992,7 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
 
         mData->enumValue = 0;
         Token *enumtok = addtoken(tokenList, "enum");
-        Token *nametok = nullptr;
+        const Token *nametok = nullptr;
         {
             int nameIndex = mExtTokens.size() - 1;
             while (nameIndex > colIndex && mExtTokens[nameIndex][0] == '\'')
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
index 2827b3cc7..0b892cc98 100644
--- a/lib/tokenlist.cpp
+++ b/lib/tokenlist.cpp
@@ -1914,6 +1914,7 @@ void TokenList::simplifyPlatformTypes()
                 tok = tok->previous();
                 tok->deleteThis();
             }
+            tok->originalName(tok->str());
             Token *typeToken;
             if (platformtype->mConstPtr) {
                 tok->str("const");
@@ -1930,7 +1931,6 @@ void TokenList::simplifyPlatformTypes()
                 tok->insertToken("*");
                 tok->insertToken("*");
             } else {
-                tok->originalName(tok->str());
                 tok->str(platformtype->mType);
                 typeToken = tok;
             }
diff --git a/test/cfg/gtk.c b/test/cfg/gtk.c
index 74c947a59..b7e4f2148 100644
--- a/test/cfg/gtk.c
+++ b/test/cfg/gtk.c
@@ -269,7 +269,7 @@ void g_new_if_test()
         int b;
     };
 
-    struct a * pNew3;
+    const struct a * pNew3;
     if (pNew3 = g_new(struct a, 6)) {
         printf("%p", pNew3);
     }
diff --git a/test/testother.cpp b/test/testother.cpp
index a77bd38a4..4440cf517 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -8946,14 +8946,14 @@ private:
               "  state_t *x = NULL;\n"
               "  x = dostuff();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("test.cpp:2:style:Variable 'x' can be declared as pointer to const\n", errout.str());
 
         check("void f() {\n"
               "  state_t *x;\n"
               "  x = NULL;\n"
               "  x = dostuff();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("test.cpp:2:style:Variable 'x' can be declared as pointer to const\n", errout.str());
 
         check("int foo() {\n" // #4420
               "    int x;\n"
@@ -9086,7 +9086,8 @@ private:
               "        barney(x);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("test.cpp:2:style:The scope of the variable 'p' can be reduced.\n",
+        ASSERT_EQUALS("test.cpp:2:style:The scope of the variable 'p' can be reduced.\n"
+                      "test.cpp:2:style:Variable 'p' can be declared as pointer to const\n",
                       errout.str());
 
         check("void foo() {\n"
@@ -9178,14 +9179,14 @@ private:
               "   a = (void*)0;\n"
               "   a = p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'a' can be declared as pointer to const\n", errout.str());
 
         check("void f() {\n"
               "   void* a;\n"
               "   a = (void*)0U;\n"
               "   a = p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'a' can be declared as pointer to const\n", errout.str());
     }
 
     void redundantVarAssignment_struct() {
@@ -9442,7 +9443,7 @@ private:
               "    int *p = NULL;\n"
               "    p = dostuff();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("test.cpp:2:style:Variable 'p' can be declared as pointer to const\n", errout.str());
 
         // "trivial" initialization => do not warn
         check("void f() {\n"