Fix #13368 Crash in simplifyTypedefCpp() (danmar#7061)

Author: chrchr-github

lib/tokenize.cpp

@@ -2080,8 +2080,8 @@ void Tokenizer::simplifyTypedefCpp()
                             // cppcheck-suppress useStlAlgorithm
                             tok2 = simplifyTypedefInsertToken(tok2, p, location);
                         if (constTok) {
-                            constTok->deleteThis();
                             tok2 = simplifyTypedefInsertToken(tok2, "const", location);
+                            constTok->deleteThis();
                         }
                     }
 

test/testsimplifytypedef.cpp

@@ -245,6 +245,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         TEST_CASE(simplifyTypedefTokenColumn1);
         TEST_CASE(simplifyTypedefTokenColumn2);
+        TEST_CASE(simplifyTypedefTokenColumn3);
 
         TEST_CASE(typedefInfo1);
 
@@ -4493,6 +4494,14 @@ class TestSimplifyTypedef : public TestFixture {
         ASSERT_EQUALS(5, type->column());
     }
 
+    void simplifyTypedefTokenColumn3() { // #13368
+        const char code[] = "typedef struct S_ {} S;\n"
+                            "typedef S* P;\n"
+                            "void f(const P p);\n";
+        ASSERT_EQUALS("struct S_ { } ; void f ( struct S_ * const p ) ;", // don't crash
+                      tok(code));
+    }
+
     void typedefInfo1() {
         const std::string xml = dumpTypedefInfo("typedef int A;\nA x;");
         ASSERT_EQUALS("  <typedef-info>\n"