Fix issue 8736: Iterators to containers from different expressions (a.begin().x == b.begin().x) (cppcheck-opensource#1370)

pfultz2 · danmar · commit f7e7e9bd3cfd · 2018-09-07T07:08:02.000+02:00
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
@@ -467,9 +467,9 @@ static const Token * getIteratorExpression(const Token * tok)
         if (iter2)
             return iter2;
     } else if (Token::Match(tok, "begin|cbegin|rbegin|crbegin|end|cend|rend|crend (")) {
-        if (Token::Match(tok->previous(), ". %name% ( )"))
+        if (Token::Match(tok->previous(), ". %name% ( ) !!."))
             return tok->previous()->astOperand1();
-        if (Token::Match(tok, "%name% ( !!)"))
+        if (Token::Match(tok, "%name% ( !!)") && !Token::simpleMatch(tok->linkAt(1), ") ."))
             return tok->next()->astOperand2();
     }
     return nullptr;
diff --git a/test/teststl.cpp b/test/teststl.cpp
@@ -705,6 +705,12 @@ class TestStl : public TestFixture {
               "    if(f().begin()+1 == f().end()+1) {}\n"
               "}\n");
         ASSERT_EQUALS("", errout.str());
+
+        check("void f() {\n"
+              "  if (a.begin().x == b.begin().x) {}\n"
+              "  if (begin(a).x == begin(b).x) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void iteratorSameExpression() {
