walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed #4234 (segmentation fault of cppcheck in Tokenizer::simplifyFlowControl() (invalid code))

This commit is contained in:
Edoardo Prezioso 2012-10-06 13:37:44 +02:00
parent c2b61030a8
commit e3bbcf501f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenize.cpp
View File

@ -2400,7 +2400,7 @@ void Tokenizer::simplifyLabelsCaseDefault()
if (Token::Match(tok, "[;{}] case")) { if (Token::Match(tok, "[;{}] case")) {
while (NULL != (tok = tok->next())) { while (NULL != (tok = tok->next())) {
if (tok->str() == ":") if (Token::Match(tok,"[:{};]"))
break; break;
} }
if (!tok) if (!tok)

3
test/testtokenize.cpp
View File

@ -5716,6 +5716,9 @@ private:
//ticket #3227 //ticket #3227
ASSERT_EQUALS("void foo ( ) { switch ( n ) { label : ; case 1 : ; label1 : ; label2 : ; break ; } }", ASSERT_EQUALS("void foo ( ) { switch ( n ) { label : ; case 1 : ; label1 : ; label2 : ; break ; } }",
tokenizeAndStringify("void foo(){ switch (n){ label: case 1: label1: label2: break; }}")); tokenizeAndStringify("void foo(){ switch (n){ label: case 1: label1: label2: break; }}"));
//ticket #4234
ASSERT_EQUALS("( ) { switch break ; { switch ( x ) { case } y break ; : } }",
tokenizeAndStringify("( ) { switch break ; { switch ( x ) { case } y break ; : } }"));
} }
void simplifyPointerToStandardType() { void simplifyPointerToStandardType() {