cppcheck-opensource
diff --git a/‎lib/checkother.cpp‎
Lines changed: 19 additions & 2 deletions b/‎lib/checkother.cpp‎
Lines changed: 19 additions & 2 deletions
diff --git a/‎lib/valueflow.cpp‎
Lines changed: 14 additions & 0 deletions b/‎lib/valueflow.cpp‎
Lines changed: 14 additions & 0 deletions
@@ -2850,15 +2850,32 @@ void CheckOtherImpl::checkInvalidFree()
 
                 const int varIndex = tok->strAt(1) == "(" ? 2 :
                                      tok->strAt(3) == "(" ? 4 : 1;
+                const Token *op = tok->tokAt(varIndex + 1);
                 const int var1 = tok->tokAt(varIndex)->varId();
                 const int var2 = tok->tokAt(varIndex + 2)->varId();
                 const auto alloc1 = utils::as_const(inconclusive).find(var1);
                 const auto alloc2 = utils::as_const(inconclusive).find(var2);
+                std::string allocArg;
+                bool inconclusiveArg;
                 if (alloc1 != inconclusive.end()) {
-                    invalidFreeError(tok, allocation[var1], alloc1->second);
+                    allocArg = allocation[var1];
+                    inconclusiveArg = alloc1->second;
                 } else if (alloc2 != inconclusive.end()) {
-                    invalidFreeError(tok, allocation[var2], alloc2->second);
+                    allocArg = allocation[var2];
+                    inconclusiveArg = alloc2->second;
+                } else {
+                    continue;
                 }
+                bool bail = false;
+                for (const auto &value : op->values()) {
+                    if (value.isSymbolicValue() && value.intvalue == 0) {
+                        bail = true;
+                        break;
+                    }
+                }
+                if (bail)
+                    continue;
+                invalidFreeError(tok, allocArg, inconclusiveArg);
             }
 
             // If the previously-allocated variable is passed in to another function
 
@@ -3737,6 +3737,20 @@ static void valueFlowSymbolicOperators(const SymbolDatabase& symboldatabase, con
                     continue;
                 if (Token::Match(tok, "<<|>>|/|-") && !astIsLHS(vartok))
                     continue;
+                if (Token::Match(tok, "+|-") && constant->intvalue != 0) {
+                    std::unordered_set<nonneg int> ids;
+                    for (const auto &value : vartok->values()) {
+                        if (!value.isSymbolicValue())
+                            continue;
+                        if (!value.tokvalue)
+                            continue;
+                        if (!ids.insert(value.tokvalue->exprId()).second)
+                            continue;
+                        ValueFlow::Value newValue(value);
+                        newValue.intvalue += tok->str() == "-" ? -constant->intvalue : constant->intvalue;
+                        setTokenValue(tok, std::move(newValue), settings);
+                    }
+                }
                 if (Token::Match(tok, "<<|>>|^|+|-|%or%") && constant->intvalue != 0)
                     continue;
                 if (Token::Match(tok, "*|/") && constant->intvalue != 1)