From 6de1711515713ae960f5f3eea455f77c1bf74b7f Mon Sep 17 00:00:00 2001
From: Robert Reif <reif@earthlink.net>
Date: Sun, 12 Sep 2010 22:40:51 +0200
Subject: [PATCH] Symbol database: reduce false negatives for 'uninitialized
 variable' when calling base class function. ticket: #1895

---
 lib/checkclass.cpp | 29 ++++++++++++++++++++++++++++-
 lib/checkclass.h   |  2 ++
 test/testclass.cpp | 12 ++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
index cd650a981..f30f72137 100644
--- a/lib/checkclass.cpp
+++ b/lib/checkclass.cpp
@@ -806,6 +806,33 @@ void CheckClass::SpaceInfo::clearAllVar()
 
 //---------------------------------------------------------------------------
 
+bool CheckClass::SpaceInfo::isBaseClassFunc(const Token *tok)
+{
+    // Iterate through each base class...
+    for (unsigned int i = 0; i < derivedFrom.size(); ++i)
+    {
+        const SpaceInfo *info = derivedFrom[i].spaceInfo;
+
+        // Check if base class exists in database
+        if (info)
+        {
+            std::list<Func>::const_iterator it;
+
+            for (it = info->functionList.begin(); it != info->functionList.end(); ++it)
+            {
+                if (it->tokenDef->str() == tok->str())
+                    return true;
+            }
+        }
+
+        // Base class not found so assume it is in it.
+        else
+            return true;
+    }
+
+    return false;
+}
+
 void CheckClass::SpaceInfo::initializeVarList(const Func &func, std::list<std::string> &callstack)
 {
     bool Assign = false;
@@ -964,7 +991,7 @@ void CheckClass::SpaceInfo::initializeVarList(const Func &func, std::list<std::s
             else
             {
                 // could be a base class virtual function, so we assume it initializes everything
-                if (!derivedFrom.empty())
+                if (isBaseClassFunc(ftok))
                     assignAllVar();
 
                 // has friends, so we assume it initializes everything
diff --git a/lib/checkclass.h b/lib/checkclass.h
index dec5da488..71712caae 100644
--- a/lib/checkclass.h
+++ b/lib/checkclass.h
@@ -295,6 +295,8 @@ private:
             }
             return 0;
         }
+
+        bool isBaseClassFunc(const Token *tok);
     };
 
     /** @brief Information about all namespaces/classes/structrues */
diff --git a/test/testclass.cpp b/test/testclass.cpp
index c5c653ec2..fcc441891 100644
--- a/test/testclass.cpp
+++ b/test/testclass.cpp
@@ -1879,6 +1879,18 @@ private:
                        "    int i;\n"
                        "};\n");
         ASSERT_EQUALS("[test.cpp:4]: (style) Member variable not initialized in the constructor 'Fred::i'\n", errout.str());
+
+        // Unknown non-member function
+        checkUninitVar("class ABC { };\n"
+                       "class Fred : private ABC\n"
+                       "{\n"
+                       "public:\n"
+                       "    Fred() { Init(); }\n"
+                       "private:\n"
+                       "    int i;\n"
+                       "};\n");
+        ASSERT_EQUALS("[test.cpp:5]: (style) Member variable not initialized in the constructor 'Fred::i'\n", errout.str());
+
     }
 
     void uninitVarEnum()