Fix issue 10106: FP: nullPointerRedundantCheck (#3044)

pfultz2 · web-flow · commit b571e9fe0b40 · 2021-01-13T12:36:26.000+01:00
diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
@@ -377,7 +377,7 @@ void execute(const Token *expr,
     if (!expr)
         *error = true;
 
-    else if (expr->hasKnownIntValue()) {
+    else if (expr->hasKnownIntValue() && !expr->isAssignmentOp()) {
         *result = expr->values().front().intvalue;
     }
 
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -431,6 +431,11 @@ static void setTokenValue(Token* tok, const ValueFlow::Value &value, const Setti
     if (!parent)
         return;
 
+    if (Token::simpleMatch(parent, "=") && astIsRHS(tok) && !value.isLifetimeValue()) {
+        setTokenValue(parent, value, settings);
+        return;
+    }
+
     if (value.isContainerSizeValue()) {
         // .empty, .size, +"abc", +'a'
         if (Token::Match(parent, "+|==|!=") && parent->astOperand1() && parent->astOperand2()) {
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
@@ -4051,7 +4051,7 @@ class TestValueFlow : public TestFixture {
                "  return((n=42) && *n == 'A');\n"
                "}";
         values = tokenValues(code, "n ==");
-        ASSERT_EQUALS(true, values.size() != 1U || !values.front().isUninitValue());
+        ASSERT_EQUALS(true, values.empty());
 
         // #8233
         code = "void foo() {\n"

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ void execute(const Token *expr,`
`377`	`377`	`if (!expr)`
`378`	`378`	`*error = true;`
`379`	`379`
`380`		`- else if (expr->hasKnownIntValue()) {`
	`380`	`+ else if (expr->hasKnownIntValue() && !expr->isAssignmentOp()) {`
`381`	`381`	`*result = expr->values().front().intvalue;`
`382`	`382`	`}`
`383`	`383`