Fix #13095 nullptr dereference in simplifyUsing() (#6796)

danmar · Sep 12, 2024 · 67d570c · 67d570c
1 parent 91151ed
commit 67d570c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -3345,7 +3345,7 @@ bool Tokenizer::simplifyUsing()
                     }
 
                     // Is this a "T(...)" expression where T is a pointer type?
-                    if (Token::Match(tok1, "%name% [({]") && !pointers.empty() && !Token::simpleMatch(tok1->linkAt(1), ") (")) {
+                    if (Token::Match(tok1, "%name% [({]") && !pointers.empty() && !Token::simpleMatch(tok1->tokAt(-1), ".")) {
                         tok1->tokAt(1)->str("(");
                         tok1->linkAt(1)->str(")");
                         if (tok1->linkAt(1) == tok1->tokAt(2)) { // T() or T{}

diff --git a/test/testsimplifyusing.cpp b/test/testsimplifyusing.cpp
@@ -783,14 +783,32 @@ class TestSimplifyUsing : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
-    void simplifyUsing32() { // #11430
-        const char code[] = "using T = int*;\n"
+    void simplifyUsing32() {
+        const char code[] = "using T = int*;\n" // #11430
                             "T f() { return T{}; }\n"
                             "T g() { return T(malloc(4)); }\n";
         const char expected[] = "int * f ( ) { return ( int * ) 0 ; } "
                                 "int * g ( ) { return ( int * ) ( malloc ( 4 ) ) ; }";
         ASSERT_EQUALS(expected, tok(code, Platform::Type::Native, /*debugwarnings*/ true));
         ASSERT_EQUALS("", errout_str());
+
+        const char code2[] = "struct S {\n" // #13095
+                             "    using reference_type = int&;\n"
+                             "    reference_type get();\n"
+                             "    int i;\n"
+                             "};\n"
+                             "auto S::get() -> reference_type {\n"
+                             "    return i;\n"
+                             "}\n";
+        const char expected2[] = "struct S { "
+                                 "int & get ( ) ; "
+                                 "int i ; "
+                                 "} ; "
+                                 "auto S :: get ( ) . int & { return i ; }";
+        ASSERT_EQUALS(expected2, tok(code2, Platform::Type::Native, /*debugwarnings*/ true));
+        TODO_ASSERT_EQUALS("",
+                           "[test.cpp:6]: (debug) auto token with no type.\n"
+                           "", errout_str());
     }
 
     void simplifyUsing8970() {