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

Fixed #9741 (Wrong value for sizeof)

This commit is contained in:
Daniel Marjamäki 2020-05-28 21:24:48 +02:00
parent e4c6ca5126
commit d64631219b
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/valueflow.cpp
View File

@ -846,40 +846,44 @@ static void setTokenValueCast(Token *parent, const ValueType &valueType, const V
static nonneg int getSizeOfType(const Token *typeTok, const Settings *settings) static nonneg int getSizeOfType(const Token *typeTok, const Settings *settings)
{ {
const std::string &typeStr = typeTok->str(); const ValueType &valueType = ValueType::parseDecl(typeTok, settings);
if (typeStr == "char") if (valueType.pointer > 0)
return settings->sizeof_pointer;
if (valueType.type == ValueType::Type::BOOL || valueType.type == ValueType::Type::CHAR)
return 1; return 1;
else if (typeStr == "short") if (valueType.type == ValueType::Type::SHORT)
return settings->sizeof_short; return settings->sizeof_short;
else if (typeStr == "int") if (valueType.type == ValueType::Type::INT)
return settings->sizeof_int; return settings->sizeof_int;
else if (typeStr == "long") if (valueType.type == ValueType::Type::LONG)
return typeTok->isLong() ? settings->sizeof_long_long : settings->sizeof_long; return settings->sizeof_long;
else if (typeStr == "wchar_t") if (valueType.type == ValueType::Type::LONGLONG)
return settings->sizeof_long_long;
if (valueType.type == ValueType::Type::WCHAR_T)
return settings->sizeof_wchar_t; return settings->sizeof_wchar_t;
else
return 0; return 0;
} }
size_t ValueFlow::getSizeOf(const ValueType &vt, const Settings *settings) size_t ValueFlow::getSizeOf(const ValueType &vt, const Settings *settings)
{ {
if (vt.pointer) if (vt.pointer)
return settings->sizeof_pointer; return settings->sizeof_pointer;
else if (vt.type == ValueType::Type::CHAR) if (vt.type == ValueType::Type::CHAR)
return 1; return 1;
else if (vt.type == ValueType::Type::SHORT) if (vt.type == ValueType::Type::SHORT)
return settings->sizeof_short; return settings->sizeof_short;
else if (vt.type == ValueType::Type::WCHAR_T) if (vt.type == ValueType::Type::WCHAR_T)
return settings->sizeof_wchar_t; return settings->sizeof_wchar_t;
else if (vt.type == ValueType::Type::INT) if (vt.type == ValueType::Type::INT)
return settings->sizeof_int; return settings->sizeof_int;
else if (vt.type == ValueType::Type::LONG) if (vt.type == ValueType::Type::LONG)
return settings->sizeof_long; return settings->sizeof_long;
else if (vt.type == ValueType::Type::LONGLONG) if (vt.type == ValueType::Type::LONGLONG)
return settings->sizeof_long_long; return settings->sizeof_long_long;
else if (vt.type == ValueType::Type::FLOAT) if (vt.type == ValueType::Type::FLOAT)
return settings->sizeof_float; return settings->sizeof_float;
else if (vt.type == ValueType::Type::DOUBLE) if (vt.type == ValueType::Type::DOUBLE)
return settings->sizeof_double; return settings->sizeof_double;
return 0; return 0;
@ -933,6 +937,8 @@ static Token * valueFlowSetConstantValue(Token *tok, const Settings *settings, b
const Token * type = tok2->enumerator()->scope->enumType; const Token * type = tok2->enumerator()->scope->enumType;
if (type) { if (type) {
size = getSizeOfType(type, settings); size = getSizeOfType(type, settings);
if (size == 0)
tok->linkAt(1);
} }
ValueFlow::Value value(size); ValueFlow::Value value(size);
if (!tok2->isTemplateArg() && settings->platformType != cppcheck::Platform::Unspecified) if (!tok2->isTemplateArg() && settings->platformType != cppcheck::Platform::Unspecified)

6
test/testvalueflow.cpp
View File

@ -813,6 +813,12 @@ private:
ASSERT_EQUALS(1U, values.size()); ASSERT_EQUALS(1U, values.size());
ASSERT_EQUALS(1, values.back().intvalue); ASSERT_EQUALS(1, values.back().intvalue);
code = "enum testEnum : uint32_t { a };\n"
"sizeof(testEnum);";
values = tokenValues(code,"( testEnum");
ASSERT_EQUALS(1U, values.size());
ASSERT_EQUALS(4, values.back().intvalue);
#define CHECK(A, B) \ #define CHECK(A, B) \
do { \ do { \
code = "void f() {\n" \ code = "void f() {\n" \