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

Fix #796 (segmentation fault while scanning) 

http://sourceforge.net/apps/trac/cppcheck/ticket/796
This commit is contained in:
Reijo Tomperi 2009-10-06 21:03:15 +03:00
parent 36fb24b1a5
commit 2e69d50458
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tokenize.cpp
View File

@ -2940,7 +2940,7 @@ void Tokenizer::simplifyIfAssign()
// Skip the "%var% = ..." // Skip the "%var% = ..."
Token *tok2; Token *tok2;
unsigned int indentlevel = 0; unsigned int indentlevel = 0;
for (tok2 = tok; tok2; tok2 = tok2->next()) for (tok2 = tok->next(); tok2; tok2 = tok2->next())
{ {
if (tok2->str() == "(") if (tok2->str() == "(")
++indentlevel; ++indentlevel;

1
test/testsimplifytokens.cpp
View File

@ -1188,6 +1188,7 @@ private:
ASSERT_EQUALS("; a = b ( ) ; if ( ( a ) ) { ; }", simplifyIfAssign(";if((a=b()));")); ASSERT_EQUALS("; a = b ( ) ; if ( ( a ) ) { ; }", simplifyIfAssign(";if((a=b()));"));
ASSERT_EQUALS("; a = b ( ) ; if ( ! ( a ) ) { ; }", simplifyIfAssign(";if(!(a=b()));")); ASSERT_EQUALS("; a = b ( ) ; if ( ! ( a ) ) { ; }", simplifyIfAssign(";if(!(a=b()));"));
ASSERT_EQUALS("; a . x = b ( ) ; if ( ! ( a . x ) ) { ; }", simplifyIfAssign(";if(!(a->x=b()));")); ASSERT_EQUALS("; a . x = b ( ) ; if ( ! ( a . x ) ) { ; }", simplifyIfAssign(";if(!(a->x=b()));"));
ASSERT_EQUALS("A ( ) a = b ; if ( a ) { ; }", simplifyIfAssign("A() if(a=b);"));
} }