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

Fixed TODO_ASSERT

This commit is contained in:
orbitcowboy 2022-06-03 18:59:09 +02:00
parent 6680bf9790
commit a74bb485b0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkfunctions.cpp
View File

@ -130,7 +130,9 @@ void CheckFunctions::invalidFunctionUsage()
if (Token::Match(argtok, "& %var% !![") && argtok->next() && argtok->next()->valueType()) { if (Token::Match(argtok, "& %var% !![") && argtok->next() && argtok->next()->valueType()) {
const ValueType * valueType = argtok->next()->valueType(); const ValueType * valueType = argtok->next()->valueType();
const Variable * variable = argtok->next()->variable(); const Variable * variable = argtok->next()->variable();
if (valueType->type == ValueType::Type::CHAR && !variable->isArray() && (variable->isConst() || !variable->isGlobal()) && if ( (valueType->type == ValueType::Type::CHAR|| (valueType->type == ValueType::Type::RECORD && Token::Match(argtok, "& %var% . %var% !!["))) &&
!variable->isArray() &&
(variable->isConst() || !variable->isGlobal()) &&
(!argtok->next()->hasKnownValue() || argtok->next()->getValue(0) == nullptr)) { (!argtok->next()->hasKnownValue() || argtok->next()->getValue(0) == nullptr)) {
invalidFunctionArgStrError(argtok, functionToken->str(), argnr); invalidFunctionArgStrError(argtok, functionToken->str(), argnr);
} }

3
test/testfunctions.cpp
View File

@ -576,7 +576,8 @@ private:
" size_t l2 = strlen(&s2.x);\n" " size_t l2 = strlen(&s2.x);\n"
" return l1 + l2;\n" " return l1 + l2;\n"
"}"); "}");
TODO_ASSERT_EQUALS("[test.cpp:9]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required.\n", "", errout.str()); ASSERT_EQUALS("[test.cpp:8]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required.\n"
"[test.cpp:9]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required.\n", errout.str());
check("const char x = 'x'; size_t f() { return strlen(&x); }"); check("const char x = 'x'; size_t f() { return strlen(&x); }");
ASSERT_EQUALS("[test.cpp:1]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required.\n", errout.str()); ASSERT_EQUALS("[test.cpp:1]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required.\n", errout.str());