Fixed #889 (false positive: uninitialized variable)

lib/checkother.cpp

@@ -1287,10 +1287,13 @@ static const Token *uninitvar_checkscope(const Token *tok, const unsigned int va
             }
         }
 
-        if (Token::Match(tok, "%varid% =", varid))
+        if (Token::Match(tok, "%varid%", varid))
         {
-            init = true;
+            if (Token::simpleMatch(tok->previous(), ">>") || Token::simpleMatch(tok->next(), "="))
-            return 0;
+            {
+                init = true;
+                return 0;
+            }
         }
 
         if (Token::Match(tok, "%var% ("))

test/testother.cpp

@@ -973,6 +973,14 @@ private:
                        "}\n");
         ASSERT_EQUALS("", errout.str());
 
+        checkUninitVar("int a()\n"
+                       "{\n"
+                       "    int ret;\n"
+                       "    std::cin >> ret;\n"
+                       "    return ret;\n"
+                       "}\n");
+        ASSERT_EQUALS("", errout.str());
+
         // if..
         checkUninitVar("static void foo()\n"
                        "{\n"