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

Token: Fixed bug in match function, simplified CheckBufferOverrun code

This commit is contained in:
Reijo Tomperi 2008-12-05 20:37:05 +00:00
parent 48dd250796
commit a669d020cf
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CheckBufferOverrun.cpp
View File

@ -112,12 +112,7 @@ void CheckBufferOverrunClass::CheckBufferOverrun_CheckScope( const TOKEN *tok, c
// memset, memcmp, memcpy, strncpy, fgets.. // memset, memcmp, memcpy, strncpy, fgets..
if (TOKEN::Match(tok,"memset") || if (TOKEN::Match(tok,"memset|memcpy|memmove|memcmp|strncpy|fgets") )
TOKEN::Match(tok,"memcpy") ||
TOKEN::Match(tok,"memmove") ||
TOKEN::Match(tok,"memcmp") ||
TOKEN::Match(tok,"strncpy") ||
TOKEN::Match(tok,"fgets") )
{ {
if ( TOKEN::Match( tok->next, "( %var1% , %num% , %num% )", varname ) || if ( TOKEN::Match( tok->next, "( %var1% , %num% , %num% )", varname ) ||
TOKEN::Match( tok->next, "( %var% , %var1% , %num% )", varname ) ) TOKEN::Match( tok->next, "( %var% , %var1% , %num% )", varname ) )

2
token.cpp
View File

@ -219,7 +219,7 @@ bool TOKEN::Match(const TOKEN *tok, const char pattern[], const char *varname1[]
// Empty alternative matches, use the same token on next round // Empty alternative matches, use the same token on next round
continue; continue;
} }
else if( res == 2 ) else if( res == -1 )
{ {
// No match // No match
return false; return false;