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

Fix crash on ternary with omitted operand (#4673) 

* Fix MSVC compiler warning

* Fix crash on incomplete ternary operator

* Revert "Fix crash on incomplete ternary operator"

This reverts commit 28df0f0ab6ff794e733617447f847a97c1a7a609.

* Handle ternary with omitted operand
This commit is contained in:
chrchr-github 2023-01-02 17:44:17 +01:00 committed by GitHub
parent bf11cdf299
commit 11f1a9d1f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/valueflow.cpp
View File

@ -1744,6 +1744,8 @@ static bool isConvertedToIntegral(const Token* tok, const Settings* settings)
static bool isSameToken(const Token* tok1, const Token* tok2) static bool isSameToken(const Token* tok1, const Token* tok2)
{ {
if (!tok1 || !tok2)
return false;
if (tok1->exprId() != 0 && tok1->exprId() == tok2->exprId()) if (tok1->exprId() != 0 && tok1->exprId() == tok2->exprId())
return true; return true;
if (tok1->hasKnownIntValue() && tok2->hasKnownIntValue()) if (tok1->hasKnownIntValue() && tok2->hasKnownIntValue())

4
test/testcmdlineparser.cpp
View File

@ -1265,7 +1265,7 @@ private:
void valueFlowMaxIterations() { void valueFlowMaxIterations() {
REDIRECT; REDIRECT;
const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=0"}; const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=0"};
settings.valueFlowMaxIterations = -1; settings.valueFlowMaxIterations = SIZE_MAX;
ASSERT(defParser.parseFromArgs(2, argv)); ASSERT(defParser.parseFromArgs(2, argv));
ASSERT_EQUALS(0, settings.valueFlowMaxIterations); ASSERT_EQUALS(0, settings.valueFlowMaxIterations);
ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
@ -1274,7 +1274,7 @@ private:
void valueFlowMaxIterations2() { void valueFlowMaxIterations2() {
REDIRECT; REDIRECT;
const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=11"}; const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=11"};
settings.valueFlowMaxIterations = -1; settings.valueFlowMaxIterations = SIZE_MAX;
ASSERT(defParser.parseFromArgs(2, argv)); ASSERT(defParser.parseFromArgs(2, argv));
ASSERT_EQUALS(11, settings.valueFlowMaxIterations); ASSERT_EQUALS(11, settings.valueFlowMaxIterations);
ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);

6
test/testvalueflow.cpp
View File

@ -6839,6 +6839,12 @@ private:
" std::shared_ptr<B> m;\n" " std::shared_ptr<B> m;\n"
"};\n"; "};\n";
valueOfTok(code, "r"); valueOfTok(code, "r");
code = "void g(int);\n"
"void f(int x, int y) {\n"
" g(x < y ? : 1);\n"
"};\n";
valueOfTok(code, "?");
} }
void valueFlowHang() { void valueFlowHang() {