This commit is contained in:
Daniel Marjamäki 2009-12-19 17:57:58 +01:00
parent c988b14fb5
commit 8a1940e043
3 changed files with 8 additions and 6 deletions

View File

@ -240,7 +240,9 @@ void CheckBufferOverrun::checkScope(const Token *tok, const char *varname[], con
if (!Token::Match(tok2, "%varid% [ %any% ] = 0 ;", tok->tokAt(2)->varId()))
{
terminateStrncpyError(tok);
} else {
}
else
{
break;
}
}

View File

@ -575,7 +575,7 @@ void CheckStl::size()
else if ((tok->tokAt(5)->str() == ")" ||
tok->tokAt(5)->str() == "&&" ||
tok->tokAt(5)->str() == "||" ||
tok->tokAt(5)->str() == "!" ) &&
tok->tokAt(5)->str() == "!") &&
(tok->tokAt(-1)->str() == "(" ||
tok->tokAt(-1)->str() == "&&" ||
tok->tokAt(-1)->str() == "||" ||

View File

@ -1455,8 +1455,8 @@ private:
void terminateStrncpy1()
{
check("void foo ( char *bar )\n"
"{\n"
check("void foo ( char *bar )\n"
"{\n"
" char baz[100];\n"
" strncpy(baz, bar, sizeof(baz));\n"
" strncpy(baz, bar, sizeof(baz));\n"
@ -1473,8 +1473,8 @@ private:
void terminateStrncpy2()
{
check("char *foo ( char *bar )\n"
"{\n"
check("char *foo ( char *bar )\n"
"{\n"
" char baz[100];\n"
" strncpy(baz, bar, sizeof(baz));\n"
" bar[99] = 0;\n"