From c74eeb6bad1d138461773383a0582605bf587823 Mon Sep 17 00:00:00 2001
From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
Date: Thu, 27 Jan 2022 19:45:27 +0100
Subject: [PATCH] Fix FN uninitVar with std::array (#3707)

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

diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
index 57b070b9a..0fb48ed37 100644
--- a/lib/checkuninitvar.cpp
+++ b/lib/checkuninitvar.cpp
@@ -137,8 +137,11 @@ void CheckUninitVar::checkScope(const Scope* scope, const std::set<std::string>
             if (tok->isStandardType() || tok->isEnumType())
                 stdtype = true;
         }
-        if (var.isArray() && !stdtype)
-            continue;
+        if (var.isArray() && !stdtype) { // std::array
+            if (!(var.isStlType() && Token::simpleMatch(var.typeStartToken(), "std :: array") && var.valueType() &&
+                  var.valueType()->containerTypeToken && var.valueType()->containerTypeToken->isStandardType()))
+                continue;
+        }
 
         while (tok && tok->str() != ";")
             tok = tok->next();
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
index 15fe8b54a..ac8787125 100644
--- a/test/testuninitvar.cpp
+++ b/test/testuninitvar.cpp
@@ -1773,6 +1773,18 @@ private:
                        "  fred[1].x = 0;\n"
                        "}", "test.c");
         ASSERT_EQUALS("", errout.str());
+
+        checkUninitVar("char f() {\n"
+                       "    std::array<char, 1> a;\n"
+                       "    return a[0];\n"
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+
+        checkUninitVar("std::string f() {\n"
+                       "    std::array<std::string, 1> a;\n"
+                       "    return a[0];\n"
+                       "}\n");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void uninitvar_pointertoarray() {