Fix crashes on nullptr (danmar#4575)

chrchr-github · web-flow · commit ffc0c57562b8 · 2022-11-09T21:56:16.000+01:00
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -697,7 +697,8 @@ void CheckClass::assignAllVarsVisibleFromScope(std::vector<Usage>& usageList, co
     for (const Type::BaseInfo& i : scope->definedType->derivedFrom) {
         const Type *derivedFrom = i.type;
 
-        assignAllVarsVisibleFromScope(usageList, derivedFrom->classScope);
+        if (derivedFrom)
+            assignAllVarsVisibleFromScope(usageList, derivedFrom->classScope);
     }
 }
 
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -7634,6 +7634,8 @@ void Tokenizer::findGarbageCode() const
                     syntaxError(tok2, "Unexpected token '" + tok2->str() + "'");
             }
         }
+        if (Token::Match(tok, "enum : %num%| {"))
+            syntaxError(tok->tokAt(2), "Unexpected token '" + tok->strAt(2) + "'");
     }
 
     // Keywords in global scope
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -656,7 +656,7 @@ static bool iscpp11init_impl(const Token * const tok)
         if (!Token::Match(colonTok->tokAt(-1), "%name%|%num% :"))
             return false;
         const Token* caseTok = colonTok->tokAt(-2);
-        while (Token::Match(caseTok->tokAt(-1), "::|%name%"))
+        while (caseTok && Token::Match(caseTok->tokAt(-1), "::|%name%"))
             caseTok = caseTok->tokAt(-1);
         return Token::simpleMatch(caseTok, "case");
     };
diff --git a/test/testconstructors.cpp b/test/testconstructors.cpp
@@ -1440,6 +1440,14 @@ class TestConstructors : public TestFixture {
                       "[test.cpp:9]: (warning) Member variable 'B::ca' is not assigned a value in 'B::operator='.\n",
                       errout.str());
 
+        check("class C : B {\n"
+              "    virtual C& operator=(C& c);\n"
+              "};\n"
+              "class D : public C {\n"
+              "    virtual C& operator=(C& c) { return C::operator=(c); };\n"
+              "};\n");
+        ASSERT_EQUALS("", errout.str());
+
     }
 
     void initvar_derived_pod_struct_with_union() {
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -6759,6 +6759,9 @@ class TestTokenizer : public TestFixture {
 
         // #9445 - typeof is not a keyword in C
         ASSERT_NO_THROW(tokenizeAndStringify("void foo() { char *typeof, *value; }", false, Settings::Native, "test.c"));
+
+        ASSERT_THROW_EQUALS(tokenizeAndStringify("enum : { };"), InternalError, "syntax error: Unexpected token '{'");
+        ASSERT_THROW_EQUALS(tokenizeAndStringify("enum : 3 { };"), InternalError, "syntax error: Unexpected token '3'");
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,8 @@ void CheckClass::assignAllVarsVisibleFromScope(std::vector<Usage>& usageList, co`
`697`	`697`	`for (const Type::BaseInfo& i : scope->definedType->derivedFrom) {`
`698`	`698`	`const Type *derivedFrom = i.type;`
`699`	`699`
`700`		`- assignAllVarsVisibleFromScope(usageList, derivedFrom->classScope);`
	`700`	`+ if (derivedFrom)`
	`701`	`+ assignAllVarsVisibleFromScope(usageList, derivedFrom->classScope);`
`701`	`702`	`}`
`702`	`703`	`}`
`703`	`704`
Original file line number	Diff line number	Diff line change
`@@ -7634,6 +7634,8 @@ void Tokenizer::findGarbageCode() const`
`7634`	`7634`	`syntaxError(tok2, "Unexpected token '" + tok2->str() + "'");`
`7635`	`7635`	`}`
`7636`	`7636`	`}`
	`7637`	`+ if (Token::Match(tok, "enum : %num%\| {"))`
	`7638`	`+ syntaxError(tok->tokAt(2), "Unexpected token '" + tok->strAt(2) + "'");`
`7637`	`7639`	`}`
`7638`	`7640`
`7639`	`7641`	`// Keywords in global scope`
Original file line number	Diff line number	Diff line change
`@@ -6759,6 +6759,9 @@ class TestTokenizer : public TestFixture {`
`6759`	`6759`
`6760`	`6760`	`// #9445 - typeof is not a keyword in C`
`6761`	`6761`	`ASSERT_NO_THROW(tokenizeAndStringify("void foo() { char typeof, value; }", false, Settings::Native, "test.c"));`
	`6762`	`+`
	`6763`	`+ ASSERT_THROW_EQUALS(tokenizeAndStringify("enum : { };"), InternalError, "syntax error: Unexpected token '{'");`
	`6764`	`+ ASSERT_THROW_EQUALS(tokenizeAndStringify("enum : 3 { };"), InternalError, "syntax error: Unexpected token '3'");`
`6762`	`6765`	`}`
`6763`	`6766`
`6764`	`6767`