Fix

Author: web-flow

lib/checkother.cpp

@@ -1727,6 +1727,9 @@ void CheckOther::checkConstVariable()
                     retTok = retTok->astOperand2();
                 if (Token::simpleMatch(retTok, "&"))
                     retTok = retTok->astOperand1();
+                ValueFlow::Value ltVal = ValueFlow::getLifetimeObjValue(retTok);
+                if (ltVal.isLifetimeValue() && ltVal.tokvalue->varId() == var->declarationId())
+                    return true;
                 return ValueFlow::hasLifetimeToken(getParentLifetime(retTok), var->nameToken(), *mSettings);
             }))
                 continue;

lib/checkstl.cpp

@@ -1091,7 +1091,7 @@ static const ValueFlow::Value* getInnerLifetime(const Token* tok,
     if (!tok)
         return nullptr;
     for (const ValueFlow::Value& val : tok->values()) {
-        if (!val.isLocalLifetimeValue() && !val.isArgumentLifetimeValue())
+        if (!val.isLocalLifetimeValue())
             continue;
         if (contains({ValueFlow::Value::LifetimeKind::Address,
                       ValueFlow::Value::LifetimeKind::SubObject,

lib/valueflow.cpp

@@ -1796,7 +1796,7 @@ static std::vector<ValueFlow::LifetimeToken> getLifetimeTokens(const Token* tok,
         if (Token::Match(tok->tokAt(-2), ". %name% (") && tok->tokAt(-2)->originalName() != "->" && astIsContainer(tok->tokAt(-2)->astOperand1())) {
             const Library::Container* library = getLibraryContainer(tok->tokAt(-2)->astOperand1());
             const Library::Container::Yield y = library->getYield(tok->strAt(-1));
-            if (contains({Library::Container::Yield::AT_INDEX, Library::Container::Yield::ITEM, Library::Container::Yield::BUFFER, Library::Container::Yield::BUFFER_NT}, y)) {
+            if (y == Library::Container::Yield::AT_INDEX || y == Library::Container::Yield::ITEM) {
                 errorPath.emplace_back(tok->previous(), "Accessing container.");
                 return ValueFlow::LifetimeToken::setAddressOf(
                     getLifetimeTokens(tok->tokAt(-2)->astOperand1(), escape, std::move(errorPath), pred, settings, depth - 1),