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

fix #2600 (segmentation fault of cppcheck ( enum{const} ))

This commit is contained in:
Robert Reif 2011-02-21 19:30:40 -05:00
parent 999646fca6
commit 4e1ce93104
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenize.cpp
View File

@ -7845,7 +7845,7 @@ void Tokenizer::simplifyEnum()
} }
// check for a variable definition: enum {} x; // check for a variable definition: enum {} x;
if (end->next()->str() != ";") if (end->next() && end->next()->str() != ";")
{ {
Token *tempTok = end; Token *tempTok = end;

7
test/testsimplifytokens.cpp
View File

@ -285,6 +285,7 @@ private:
TEST_CASE(enum17); // ticket #2381 (duplicate enums) TEST_CASE(enum17); // ticket #2381 (duplicate enums)
TEST_CASE(enum18); // #2466 (array with same name as enum constant) TEST_CASE(enum18); // #2466 (array with same name as enum constant)
TEST_CASE(enum19); // ticket #2536 TEST_CASE(enum19); // ticket #2536
TEST_CASE(enum20); // ticket #2600
// remove "std::" on some standard functions // remove "std::" on some standard functions
TEST_CASE(removestd); TEST_CASE(removestd);
@ -6183,6 +6184,12 @@ private:
ASSERT_EQUALS(";", tok(code, false)); ASSERT_EQUALS(";", tok(code, false));
} }
void enum20() // ticket #2600 segmentation fault
{
const char code[] = "enum { const }\n";
ASSERT_EQUALS(";", tok(code, false));
}
void removestd() void removestd()
{ {
ASSERT_EQUALS("; strcpy ( a , b ) ;", tok("; std::strcpy(a,b);")); ASSERT_EQUALS("; strcpy ( a , b ) ;", tok("; std::strcpy(a,b);"));