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

astyle

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkbufferoverrun.cpp
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())) if (!Token::Match(tok2, "%varid% [ %any% ] = 0 ;", tok->tokAt(2)->varId()))
{ {
terminateStrncpyError(tok); terminateStrncpyError(tok);
} else { }
else
{
break; break;
} }
} }

2
lib/checkstl.cpp
View File

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

8
test/testbufferoverrun.cpp
View File

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