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

astyle fix

This commit is contained in:
Reijo Tomperi 2010-04-06 16:56:06 +03:00
parent c4d1d47f6b
commit c28b365ea0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkbufferoverrun.cpp
View File

@ -618,7 +618,7 @@ void CheckBufferOverrun::checkScope(const Token *tok, const std::vector<std::str
Token::Match(tok, "fread|fwrite ( %varid% , %num% , %num% , %any% )", varid) && Token::Match(tok, "fread|fwrite ( %varid% , %num% , %num% , %any% )", varid) &&
MathLib::isInt(tok->strAt(6))) MathLib::isInt(tok->strAt(6)))
{ {
long len = MathLib::toLongNumber(tok->strAt(4))*MathLib::toLongNumber(tok->strAt(6)); long len = MathLib::toLongNumber(tok->strAt(4)) * MathLib::toLongNumber(tok->strAt(6));
if (len < 0 || len > total_size) if (len < 0 || len > total_size)
{ {
bufferOverrun(tok); bufferOverrun(tok);

16
test/testbufferoverrun.cpp
View File

@ -1073,30 +1073,30 @@ private:
// fread // fread
check("void f(FILE* fd)\n" check("void f(FILE* fd)\n"
"{\n" "{\n"
"char str[3];\n" "char str[3];\n"
"fread(str,sizeof(char),4,fd);\n" "fread(str,sizeof(char),4,fd);\n"
"}\n"); "}\n");
ASSERT_EQUALS("[test.cpp:4]: (error) Buffer access out-of-bounds\n", errout.str()); ASSERT_EQUALS("[test.cpp:4]: (error) Buffer access out-of-bounds\n", errout.str());
check("void f(FILE* fd)\n" check("void f(FILE* fd)\n"
"{\n" "{\n"
"char str[3*sizeof(char)];\n" "char str[3*sizeof(char)];\n"
"fread(str,sizeof(char),3,fd);\n" "fread(str,sizeof(char),3,fd);\n"
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
// fwrite // fwrite
check("void f(FILE* fd)\n" check("void f(FILE* fd)\n"
"{\n" "{\n"
"char str[3];\n" "char str[3];\n"
"fwrite(str,sizeof(char),4,fd);\n" "fwrite(str,sizeof(char),4,fd);\n"
"}\n"); "}\n");
ASSERT_EQUALS("[test.cpp:4]: (error) Buffer access out-of-bounds\n", errout.str()); ASSERT_EQUALS("[test.cpp:4]: (error) Buffer access out-of-bounds\n", errout.str());
check("void f(FILE* fd)\n" check("void f(FILE* fd)\n"
"{\n" "{\n"
"char str[3*sizeof(char)];\n" "char str[3*sizeof(char)];\n"
"fwrite(str,sizeof(char),3,fd);\n" "fwrite(str,sizeof(char),3,fd);\n"
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());