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

ValueFlow: handling of char literal size before ValueType has been set

This commit is contained in:
Daniel Marjamäki 2019-10-31 14:06:34 +01:00
parent db7cddf163
commit 6e9d496ab3
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/valueflow.cpp
View File

@ -1004,7 +1004,20 @@ static Token * valueFlowSetConstantValue(Token *tok, const Settings *settings, b
setTokenValue(const_cast<Token *>(tok->next()), value, settings);
}
} else if (tok2->tokType() == Token::eChar) {
size_t sz = ValueFlow::getSizeOf(*tok2->valueType(), settings);
nonneg int sz = 0;
if (cpp && settings->standards.cpp >= Standards::CPP20 && tok2->isUtf8())
sz = 1;
else if (tok2->isUtf16())
sz = 2;
else if (tok2->isUtf32())
sz = 4;
else if (tok2->isLong())
sz = settings->sizeof_wchar_t;
else if ((tok2->isCChar() && !cpp) || (tok2->isCMultiChar()))
sz = settings->sizeof_int;
else
sz = 1;
if (sz > 0) {
ValueFlow::Value value(sz);
value.setKnown();