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

#5875 fix 'lib/checksizeof.cpp:142:26: runtime error: member call on null pointer of type 'Token'. Improve error handling in CheckSizeof::checkSizeofForPointerSize()

This commit is contained in:
Alexander Mai 2014-06-01 22:18:17 +02:00
parent 7a668bb752
commit ad1662a201
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checksizeof.cpp
View File

@ -139,6 +139,8 @@ void CheckSizeof::checkSizeofForPointerSize()
} else if (Token::Match(tok, "memcpy|memcmp|memmove|strncpy|strncmp|strncat (")) { } else if (Token::Match(tok, "memcpy|memcmp|memmove|strncpy|strncmp|strncat (")) {
variable = tok->tokAt(2); variable = tok->tokAt(2);
variable2 = variable->nextArgument(); variable2 = variable->nextArgument();
if (!variable2)
continue;
tokVar = variable2->nextArgument(); tokVar = variable2->nextArgument();
} else { } else {

9
test/testsizeof.cpp
View File

@ -40,6 +40,7 @@ private:
TEST_CASE(sizeofForNumericParameter); TEST_CASE(sizeofForNumericParameter);
TEST_CASE(suspiciousSizeofCalculation); TEST_CASE(suspiciousSizeofCalculation);
TEST_CASE(sizeofVoid); TEST_CASE(sizeofVoid);
TEST_CASE(customStrncat);
} }
void check(const char code[]) { void check(const char code[]) {
@ -635,6 +636,14 @@ private:
ASSERT_EQUALS("[test.cpp:5]: (portability) '(foo[0]).data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.\n", errout.str()); ASSERT_EQUALS("[test.cpp:5]: (portability) '(foo[0]).data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.\n", errout.str());
} }
void customStrncat() {
// Ensure we don't crash on custom-defined strncat, ticket #5875
check("char strncat ();\n"
"int main () {\n"
" return strncat ();\n"
"}\n");
}
}; };
REGISTER_TEST(TestSizeof) REGISTER_TEST(TestSizeof)