Merge branch 'main' into chr_13218

Author: chrchr-github

lib/checkclass.cpp

@@ -856,7 +856,9 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
         if (!Token::Match(ftok->next(), "::| %name%") &&
             !Token::Match(ftok->next(), "*| this . %name%") &&
             !Token::Match(ftok->next(), "* %name% =") &&
-            !Token::Match(ftok->next(), "( * this ) . %name%"))
+            !Token::Match(ftok->next(), "( * this ) . %name%") &&
+            !Token::Match(ftok->next(), "( * %name% ) =") &&
+            !Token::Match(ftok->next(), "* ( %name% ) ="))
             continue;
 
         // Goto the first token in this statement..
@@ -1060,6 +1062,10 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
         // Assignment of array item of member variable?
         else if (Token::Match(ftok, "* %name% =")) {
             assignVar(usage, ftok->next()->varId());
+        } else if (Token::Match(ftok, "( * %name% ) =")) {
+            assignVar(usage, ftok->tokAt(2)->varId());
+        } else if (Token::Match(ftok, "* ( %name% ) =")) {
+            assignVar(usage, ftok->tokAt(2)->varId());
         } else if (Token::Match(ftok, "* this . %name% =")) {
             assignVar(usage, ftok->tokAt(3)->varId());
         } else if (astIsRangeBasedForDecl(ftok)) {

lib/tokenize.cpp

@@ -8530,6 +8530,9 @@ void Tokenizer::findGarbageCode() const
         else if (Token::Match(tok, "[({<] %assign%"))
             syntaxError(tok);
 
+        else if (Token::Match(tok, "%assign% >"))
+            syntaxError(tok);
+
         else if (Token::Match(tok, "[`\\@]"))
             syntaxError(tok);
 

lib/tokenlist.cpp

@@ -1885,6 +1885,10 @@ void TokenList::validateAst(bool print) const
                 throw InternalError(tok, "Syntax Error: AST broken, binary operator '" + tok->str() + "' doesn't have two operands.", InternalError::AST);
         }
 
+        if (Token::Match(tok, "++|--") && !tok->astOperand1()) {
+            throw InternalError(tok, "Syntax Error: AST broken, operator '" + tok->str() + "' doesn't have an operand.", InternalError::AST);
+        }
+
         // Check control blocks and asserts
         if (Token::Match(tok->previous(), "if|while|for|switch|assert|ASSERT (")) {
             if (!tok->astOperand1() || !tok->astOperand2())

test/cli/fuzz-crash/crash-522f048722bf5f33fa10a32a4c5253d1dc8b01d5

@@ -0,0 +1 @@
+C(){o y=>::*}

test/cli/fuzz-crash/crash-78bcf47420424bf607f6697cf84ddd84b4dfbeb9

@@ -0,0 +1 @@
+assert(a~--)

test/testclass.cpp

@@ -80,6 +80,8 @@ class TestClass : public TestFixture {
         TEST_CASE(operatorEqToSelf8);   // ticket #2179
         TEST_CASE(operatorEqToSelf9);   // ticket #2592
 
+        TEST_CASE(operatorEqPtrAssign); // ticket #13203
+
         TEST_CASE(memsetOnStruct);
         TEST_CASE(memsetVector);
         TEST_CASE(memsetOnClass);
@@ -2589,6 +2591,55 @@ class TestClass : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+#define checkConstructors(code) checkConstructors_(code, __FILE__, __LINE__)
+    template<size_t size>
+    void checkConstructors_(const char (&code)[size], const char* file, int line) {
+        const Settings settings = settingsBuilder().severity(Severity::warning).build();
+
+        // Tokenize..
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
+
+        // Check..
+        CheckClass checkClass(&tokenizer, &settings, this);
+        (checkClass.constructors)();
+    }
+
+    void operatorEqPtrAssign() { // ticket #13203
+        checkConstructors("struct S {\n"
+                          "    int* m_data;\n"
+                          "    S() : m_data(new int()) {}\n"
+                          "    S& operator=(const S& s) {\n"
+                          "        if (&s != this) {\n"
+                          "            *(m_data) = *(s.m_data);\n"
+                          "        }\n"
+                          "        return *this;\n"
+                          "    }\n"
+                          "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkConstructors("struct S {\n"
+                          "    int* m_data;\n"
+                          "    S() : m_data(new int()) {}\n"
+                          "    S& operator=(const S& s) {\n"
+                          "        if (&s != this) {\n"
+                          "            (*m_data) = *(s.m_data);\n"
+                          "        }\n"
+                          "        return *this;\n"
+                          "    }\n"
+                          "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkConstructors("struct S {\n"
+                          "    int* m_data;\n"
+                          "    S() : m_data(new int()) {}\n"
+                          "    S& operator=(const S& s) {\n"
+                          "        return *this;\n"
+                          "    }\n"
+                          "};\n");
+        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'S::m_data' is not assigned a value in 'S::operator='.\n", errout_str());
+    }
+
     // Check that base classes have virtual destructors
 #define checkVirtualDestructor(...) checkVirtualDestructor_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>

test/testpostfixoperator.cpp

@@ -305,9 +305,9 @@ class TestPostfixOperator : public TestFixture {
     }
 
     void test2168() {
-        check("--> declare allocator lock here\n"
-              "int main(){}");
-        ASSERT_EQUALS("", errout_str());
+        ASSERT_THROW_INTERNAL(check("--> declare allocator lock here\n"
+                                    "int main(){}"),
+                              AST);
     }
 
     void pointerSimplest() {