Fixed ticket #3482 (segmentation fault of cppcheck ( switch(){case} ))

lib/tokenize.cpp

@@ -2694,20 +2694,31 @@ void Tokenizer::arraySize()
 
 void Tokenizer::simplifyLabelsCaseDefault()
 {
-    for (Token *tok = _tokens; tok; tok = tok->next()) {
+    bool executablescope = false;
-        if (Token::Match(tok, ") const| {")) {
-            // Simplify labels in the executable scope..
     unsigned int indentlevel = 0;
-            while (NULL != (tok = tok->next())) {
+    for (Token *tok = _tokens; tok; tok = tok->next()) {
+        // Simplify labels in the executable scope..
+        if (Token::Match(tok, ") const| {")) {
+            tok = tok->next();
+            if (tok->str() == "const")
+                tok = tok->next();
+            executablescope = true;
+        }
+
+        if (!executablescope)
+            continue;
+
         if (tok->str() == "{") {
-                    if (tok->previous() && tok->previous()->str() == "=")
+            if (tok->previous()->str() == "=")
                 tok = tok->link();
             else
                 ++indentlevel;
         } else if (tok->str() == "}") {
             --indentlevel;
-                    if (!indentlevel)
+            if (!indentlevel) {
-                        break;
+                executablescope = false;
+                continue;
+            }
         } else if (tok->str() == "(" || tok->str() == "[")
             tok = tok->link();
 
@@ -2716,7 +2727,10 @@ void Tokenizer::simplifyLabelsCaseDefault()
                 if (tok->str() == ":")
                     break;
             }
-                    if (Token::Match(tok, ": !!;")) {
+            if (!tok)
+                break;
+            else if (tok->str() == ":" &&
+                     (!tok->next() || tok->next()->str() != ";")) {
                 tok->insertToken(";");
             }
         } else if (Token::Match(tok, "[;{}] %var% : !!;")) {
@@ -2725,8 +2739,6 @@ void Tokenizer::simplifyLabelsCaseDefault()
         }
     }
 }
-    }
-}
 
 
 

test/testtokenize.cpp

@@ -5239,6 +5239,8 @@ private:
         //with unhandled MACRO() code
         ASSERT_EQUALS(" void f(){ MACRO( ab: b=0;, foo)}", labels_("void f() { MACRO(ab: b=0;, foo)}"));
         ASSERT_EQUALS(" void f(){ MACRO( bar, ab:{&(* b. x)=0;})}", labels_("void f() { MACRO(bar, ab: {&(*b.x)=0;})}"));
+        //don't crash with garbage code
+        ASSERT_EQUALS(" switch(){ case}", labels_("switch(){case}"));
     }
 
     // Check simplifyInitVar