Tokenizer: better handling of 'struct AB ab; sizeof(ab)'

lib/tokenize.cpp

@@ -4191,6 +4191,11 @@ void Tokenizer::simplifySizeof()
                 sizeOfVar[varId] = MathLib::toString<unsigned int>(size);
             }
 
+            else if (Token::Match(tok->tokAt(-3), "[;{}(,] struct %type% %var% [;,)]"))
+            {
+                sizeOfVar[varId] = "100";
+            }
+
             else if (Token::Match(tok->tokAt(-1), "%type% %var% [ %num% ] [;=]") ||
                      Token::Match(tok->tokAt(-2), "%type% * %var% [ %num% ] [;=]"))
             {

test/testsimplifytokens.cpp

@@ -86,6 +86,7 @@ private:
         TEST_CASE(sizeof21);    // #2232 - sizeof...(Args)
         TEST_CASE(sizeof22);    // #2599
         TEST_CASE(sizeof23);    // #2604
+        TEST_CASE(sizeof24);    // struct variable
         TEST_CASE(sizeofsizeof);
         TEST_CASE(casting);
 
@@ -1475,6 +1476,14 @@ private:
         tok(code);
     }
 
+    void sizeof24()
+    {
+        const char code[] = "; struct AB ab; sizeof(ab)";
+
+        // don't segfault
+        ASSERT_EQUALS("; struct AB ab ; 100", tok(code));
+    }
+
 
     void sizeofsizeof()
     {