From 5f68f3ddf6dd53e3a1af4da246e5c4ecc8ff442b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 21 Nov 2015 19:31:18 +0100
Subject: [PATCH] Fixed #6264 (FP: gimp: struct initialized via pointers to
 member variables)

---
 lib/checkuninitvar.cpp | 2 ++
 test/testuninitvar.cpp | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
index 9fb2b9bfe..a7304fabd 100644
--- a/lib/checkuninitvar.cpp
+++ b/lib/checkuninitvar.cpp
@@ -676,6 +676,8 @@ bool CheckUninitVar::checkIfForWhileHead(const Token *startparentheses, const Va
     for (const Token *tok = startparentheses->next(); tok && tok != endpar; tok = tok->next()) {
         if (tok->varId() == var.declarationId()) {
             if (Token::Match(tok, "%name% . %name%")) {
+                if (membervar.empty())
+                    return true;
                 if (tok->strAt(2) == membervar) {
                     if (isMemberVariableAssignment(tok, membervar))
                         return true;
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
index 2d7bda783..aeaca2701 100644
--- a/test/testuninitvar.cpp
+++ b/test/testuninitvar.cpp
@@ -844,6 +844,13 @@ private:
                        "}");
         ASSERT_EQUALS("", errout.str());
 
+        checkUninitVar("void f() {\n"
+                       "    C c;\n"
+                       "    if (fun(&c.d));\n"
+                       "    return c;\n"
+                       "}");
+        ASSERT_EQUALS("", errout.str());
+
         checkUninitVar("void f() {\n"
                        "   char a[10];\n"
                        "   if (a[0] = x){}\n"