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

more cleanup of std.cfg testing in TestBufferOverrun

This commit is contained in:
Daniel Marjamäki 2015-02-14 18:55:54 +01:00
parent 2da43035f4
commit cc0f61376a
1 changed files with 31 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
test/testbufferoverrun.cpp
View File

@ -85,17 +85,6 @@ private:
checkBufferOverrun.arrayIndexThenCheck(); checkBufferOverrun.arrayIndexThenCheck();
} }
void checkstd(const char code[], const char filename[] = "test.cpp") {
static bool init;
static Settings settings;
if (!init) {
init = true;
LOAD_LIB_2(settings.library, "std.cfg");
settings.addEnabled("warning");
}
check(code, settings, filename);
}
void run() { void run() {
TEST_CASE(noerr1); TEST_CASE(noerr1);
TEST_CASE(noerr2); TEST_CASE(noerr2);
@ -208,15 +197,13 @@ private:
TEST_CASE(strncat1); TEST_CASE(strncat1);
TEST_CASE(strncat2); TEST_CASE(strncat2);
TEST_CASE(strncat3); TEST_CASE(strncat3);
TEST_CASE(strncat4);
TEST_CASE(strcat1); TEST_CASE(strcat1);
TEST_CASE(strcat2); TEST_CASE(strcat2);
TEST_CASE(strcat3); TEST_CASE(strcat3);
TEST_CASE(varid1); TEST_CASE(varid1);
TEST_CASE(varid2); TEST_CASE(varid2); // ticket #4764
TEST_CASE(varid3); // ticket #4764
TEST_CASE(assign1); TEST_CASE(assign1);
@ -224,7 +211,6 @@ private:
TEST_CASE(alloc_malloc); // Buffer allocated with malloc TEST_CASE(alloc_malloc); // Buffer allocated with malloc
TEST_CASE(alloc_string); // statically allocated buffer TEST_CASE(alloc_string); // statically allocated buffer
TEST_CASE(alloc_alloca); // Buffer allocated with alloca TEST_CASE(alloc_alloca); // Buffer allocated with alloca
TEST_CASE(malloc_memset); // using memset on buffer allocated with malloc
TEST_CASE(countSprintfLength); TEST_CASE(countSprintfLength);
TEST_CASE(minsize_argvalue); TEST_CASE(minsize_argvalue);
@ -2727,7 +2713,7 @@ private:
} }
void strncat1() { void strncat1() {
checkstd("void f(char *a, char *b) {\n" check("void f(char *a, char *b) {\n"
" char str[16];\n" " char str[16];\n"
" strncpy(str, a, 10);\n" " strncpy(str, a, 10);\n"
" strncat(str, b, 10);\n" " strncat(str, b, 10);\n"
@ -2736,7 +2722,7 @@ private:
} }
void strncat2() { void strncat2() {
checkstd("void f(char *a) {\n" check("void f(char *a) {\n"
" char str[5];\n" " char str[5];\n"
" strncat(str, a, 5);\n" " strncat(str, a, 5);\n"
"}"); "}");
@ -2744,16 +2730,7 @@ private:
} }
void strncat3() { void strncat3() {
checkstd("struct Foo { char a[4]; };\n" check("void f(char *a) {\n"
"void f(char *a) {\n"
" struct Foo x;\n"
" strncat(x.a, a, 5);\n"
"}");
ASSERT_EQUALS("[test.cpp:4]: (error) Buffer is accessed out of bounds: x.a\n", errout.str());
}
void strncat4() {
checkstd("void f(char *a) {\n"
" char str[5];\n" " char str[5];\n"
" strncat(str, \"foobar\", 5);\n" " strncat(str, \"foobar\", 5);\n"
"}"); "}");
@ -2762,7 +2739,7 @@ private:
void strcat1() { void strcat1() {
checkstd("struct Foo { char a[4]; };\n" check("struct Foo { char a[4]; };\n"
"void f() {\n" "void f() {\n"
" struct Foo x;\n" " struct Foo x;\n"
" strcat(x.a, \"aa\");\n" " strcat(x.a, \"aa\");\n"
@ -2772,7 +2749,7 @@ private:
} }
void strcat2() { void strcat2() {
checkstd("struct Foo { char a[5]; };\n" check("struct Foo { char a[5]; };\n"
"void f() {\n" "void f() {\n"
" struct Foo x;\n" " struct Foo x;\n"
" strcat(x.a, \"aa\");\n" " strcat(x.a, \"aa\");\n"
@ -2782,7 +2759,7 @@ private:
} }
void strcat3() { void strcat3() {
checkstd("void f() {\n" check("void f() {\n"
" INT str[10];\n" " INT str[10];\n"
" strcat(str, \"aa\");\n" " strcat(str, \"aa\");\n"
"}"); "}");
@ -2802,21 +2779,7 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void varid2() { // #4764
void varid2() {
checkstd("void foo()\n"
"{\n"
" char str[10];\n"
" if (str[0])\n"
" {\n"
" char str[50];\n"
" memset(str,0,50);\n"
" }\n"
"}");
ASSERT_EQUALS("", errout.str());
}
void varid3() { // #4764
check("struct foo {\n" check("struct foo {\n"
" void bar() { return; }\n" " void bar() { return; }\n"
" type<> member[1];\n" " type<> member[1];\n"
@ -2962,14 +2925,6 @@ private:
ASSERT_EQUALS("[test.cpp:4]: (error) Array 's[10]' accessed at index 10, which is out of bounds.\n", errout.str()); ASSERT_EQUALS("[test.cpp:4]: (error) Array 's[10]' accessed at index 10, which is out of bounds.\n", errout.str());
} }
void malloc_memset() {
checkstd("void f() {\n"
" char *p = malloc(10);\n"
" memset(p,0,100);\n"
"}");
ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds.\n", errout.str());
}
void countSprintfLength() const { void countSprintfLength() const {
std::list<const Token*> unknownParameter; std::list<const Token*> unknownParameter;
unknownParameter.push_back(0); unknownParameter.push_back(0);