SonarScanで検出されたStaticVectorの範囲外アクセスを修正する

sakura_core/util/StaticType.h

@@ -27,6 +27,8 @@
 #define SAKURA_STATICTYPE_54CC2BD5_4C7C_4584_B515_EF8C533B90EA_H_
 #pragma once
 
+#include <stdexcept>
+
 #include "util/string_ex.h"
 #include "debug/Debug2.h"
 
@@ -62,8 +64,10 @@ class StaticVector{
 	void push_back(SET_TYPE e)
 	{
 		assert(m_nCount<MAX_SIZE);
-		m_nCount++;
-		m_aElements[m_nCount-1]=e;
+		if (MAX_SIZE <= m_nCount) {
+			throw std::out_of_range("m_nCount is out of range.");
+		}
+		m_aElements[m_nCount++] = e;
 	}
 	void resize(int nNewSize)
 	{

tests/unittests/test-statictype.cpp

@@ -0,0 +1,69 @@
+/*! @file */
+/*
+	Copyright (C) 2021 Sakura Editor Organization
+
+	This software is provided 'as-is', without any express or implied
+	warranty. In no event will the authors be held liable for any damages
+	arising from the use of this software.
+
+	Permission is granted to anyone to use this software for any purpose,
+	including commercial applications, and to alter it and redistribute it
+	freely, subject to the following restrictions:
+
+		1. The origin of this software must not be misrepresented;
+		   you must not claim that you wrote the original software.
+		   If you use this software in a product, an acknowledgment
+		   in the product documentation would be appreciated but is
+		   not required.
+
+		2. Altered source versions must be plainly marked as such,
+		   and must not be misrepresented as being the original software.
+
+		3. This notice may not be removed or altered from any source
+		   distribution.
+*/
+#include <gtest/gtest.h>
+
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif /* #ifndef NOMINMAX */
+
+#include <tchar.h>
+#include <Windows.h>
+#include <Shlwapi.h>
+
+#include "util/StaticType.h"
+
+/*!
+	@brief StaticVectorのテスト
+ */
+TEST(StaticVector, push_back)
+{
+	// サイズ1の配列を用意する
+	auto vec = StaticVector<long long, 1>();
+	const auto& constVec = vec;
+	EXPECT_EQ(0, vec.size());
+	EXPECT_EQ(1, vec.max_size());
+
+	// 1つめのデータを登録する
+	vec.push_back(0xabcdef);
+	EXPECT_EQ(1, vec.size());
+	EXPECT_EQ(0xabcdef, vec[0]);
+	EXPECT_EQ(0xabcdef, constVec[0]);
+
+	// 飽和したのでこれ以上追加できない
+	EXPECT_EQ(vec.max_size(), vec.size());
+
+	// 追加しようとしてもできないことを確認する
+
+#ifdef _DEBUG
+	// デバッグビルドでは、正常にクラッシュする
+	EXPECT_DEATH({ vec.push_back(0xffffff); }, "");
+#else
+	// リリースビルドでもクラッシュする
+	EXPECT_THROW({ vec.push_back(0xffffff); }, std::out_of_range);
+#endif
+
+	// 追加できないので、サイズをカウントアップしてはいけない
+	EXPECT_EQ(1, vec.size());
+}

tests/unittests/tests1.vcxproj

@@ -147,6 +147,7 @@
     <ClCompile Include="test-sample-disabled.cpp" />
     <ClCompile Include="test-sample.cpp" />
     <ClCompile Include="test-ssearchoption.cpp" />
+    <ClCompile Include="test-statictype.cpp" />
     <ClCompile Include="test-StdControl.cpp" />
     <ClCompile Include="test-string_ex.cpp" />
     <ClCompile Include="test-zoom.cpp" />

tests/unittests/tests1.vcxproj.filters

@@ -154,6 +154,9 @@
     <ClCompile Include="test-czipfile.cpp">
       <Filter>Test Files</Filter>
     </ClCompile>
+    <ClCompile Include="test-statictype.cpp">
+      <Filter>Test Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="StartEditorProcessForTest.h">