Cpp Core Check

appveyor.yml

@@ -54,9 +54,10 @@ environment:
       OUTPUTXML_TYPE: xml
     # Prefast
     - job_group: VisualStudio
-      job_depends_on: VS2015
+      job_depends_on: VS2022
       BUILD_PREFAST: yes
-      PROJECT_DIR: vs2015
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
+      PROJECT_DIR: vs2022
     # Menu
     - job_group: VisualStudio
       BUILD_MENU: yes
@@ -285,9 +286,10 @@ for:
   environment:
     MSBUILD_LOGGER_OPTION: /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
     MSBUILD_PREFAST_OPTION: /p:RunCodeAnalysis=true /p:EnablePREfast=true /p:CodeAnalysisTreatWarningsAsErrors=true
+    CPPCORE_CHECK_OPTION: /p:CodeAnalysisRuleSet=CppCoreCheckRules.ruleset
   before_build: *noop
   build_script:
-    cmd: msbuild "projects\%PROJECT_DIR%\iutest_sample.vcxproj" /m %MSBUILD_LOGGER_OPTION% %MSBUILD_PREFAST_OPTION%
+    cmd: msbuild "projects\%PROJECT_DIR%\iutest_sample.vcxproj" /m %MSBUILD_LOGGER_OPTION% %MSBUILD_PREFAST_OPTION% %CPPCORE_CHECK_OPTION% /p:ForceImportBeforeCppTargets=%APPVEYOR_BUILD_FOLDER%/utils/props/CppCoreCheckDisableSpecificWarnings.props
   test: off
   on_finish: *noop
 # Menu

include/impl/iutest_body.ipp

@@ -6,7 +6,7 @@
  *
  * @author      t.shirayanagi
  * @par         copyright
- * Copyright (C) 2011-2019, Takazumi Shirayanagi\n
+ * Copyright (C) 2011-2021, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */
@@ -59,8 +59,8 @@ IUTEST_IPP_INLINE void Test::Run(detail::iuITestInfoMediator* test_info)
 
     TearDown();
 
-    test_info_ = NULL;
-    m_test_info = NULL;
+    test_info_ = IUTEST_NULLPTR;
+    m_test_info = IUTEST_NULLPTR;
 }
 
 }   // end of namespace iutest

include/impl/iutest_charcode.ipp

@@ -6,7 +6,7 @@
  *
  * @author      t.shirayanagi
  * @par         copyright
- * Copyright (C) 2011-2020, Takazumi Shirayanagi\n
+ * Copyright (C) 2011-2022, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */
@@ -30,10 +30,10 @@ namespace detail
 
 //======================================================================
 // variable
-const UInt32 kMaxCodePoint1 = (static_cast<UInt32>(1) << 7) - 1;
-const UInt32 kMaxCodePoint2 = (static_cast<UInt32>(1) << (5+6)) - 1;
-const UInt32 kMaxCodePoint3 = (static_cast<UInt32>(1) << (4+2*6)) - 1;
-const UInt32 kMaxCodePoint4 = (static_cast<UInt32>(1) << (3+3*6)) - 1;
+IUTEST_CXX_CONSTEXPR_OR_CONST UInt32 kMaxCodePoint1 = (static_cast<UInt32>(1) << 7) - 1;
+IUTEST_CXX_CONSTEXPR_OR_CONST UInt32 kMaxCodePoint2 = (static_cast<UInt32>(1) << (5+6)) - 1;
+IUTEST_CXX_CONSTEXPR_OR_CONST UInt32 kMaxCodePoint3 = (static_cast<UInt32>(1) << (4+2*6)) - 1;
+IUTEST_CXX_CONSTEXPR_OR_CONST UInt32 kMaxCodePoint4 = (static_cast<UInt32>(1) << (3+3*6)) - 1;
 
 //======================================================================
 // function
@@ -66,7 +66,7 @@ IUTEST_IPP_INLINE IUTEST_CXX_CONSTEXPR UInt32 CreateCodePointFromUtf16SurrogateP
 /**
  * @brief   下位から指定ビット数のビットを取得してシフトする
 */
-IUTEST_IPP_INLINE UInt32 ChopLowBits(UInt32* bits, int n)
+IUTEST_IPP_INLINE UInt32 ChopLowBits(UInt32* bits, int n) IUTEST_CXX_NOEXCEPT_SPEC
 {
     const UInt32 lowbits = *bits & ((static_cast<UInt32>(1) << n) - 1);
     *bits >>= n;
@@ -119,28 +119,25 @@ IUTEST_IPP_INLINE char* CodePointToUtf8(UInt32 code_point, char* buf, size_t siz
 IUTEST_IPP_INLINE ::std::string IUTEST_ATTRIBUTE_UNUSED_ UTF8ToSJIS(const ::std::string& str)
 {
     const int src_length = static_cast<int>(str.length() + 1);
-    const int lengthWideChar = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), src_length, NULL, 0);
+    const int lengthWideChar = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), src_length, IUTEST_NULLPTR, 0);
     if( lengthWideChar <= 0 )
     {
         return "(convert error)";
     }
 
-    wchar_t* wbuf = new wchar_t[lengthWideChar];
+    type_array<wchar_t> wbuf(lengthWideChar);
     MultiByteToWideChar(CP_UTF8, 0, str.c_str(), src_length, wbuf, lengthWideChar);
 
-    const int lengthSJIS = WideCharToMultiByte(CP_THREAD_ACP, 0, wbuf, -1, NULL, 0, NULL, NULL);
+    const int lengthSJIS = WideCharToMultiByte(CP_THREAD_ACP, 0, wbuf, -1, IUTEST_NULLPTR, 0, IUTEST_NULLPTR, IUTEST_NULLPTR);
     if( lengthSJIS <= 0 )
     {
-        delete[] wbuf;
         return "(convert error)";
     }
 
-    char* buf = new char[lengthSJIS];
-    WideCharToMultiByte(CP_THREAD_ACP, 0, wbuf, -1, buf, lengthSJIS, NULL, NULL);
+    type_array<char> buf(lengthSJIS);
+    WideCharToMultiByte(CP_THREAD_ACP, 0, wbuf, -1, buf, lengthSJIS, IUTEST_NULLPTR, IUTEST_NULLPTR);
 
     ::std::string ret(buf);
-    delete[] wbuf;
-    delete[] buf;
     return ret;
 }
 #endif
@@ -186,18 +183,16 @@ IUTEST_IPP_INLINE ::std::string IUTEST_ATTRIBUTE_UNUSED_ AnyStringToMultiByteStr
     return win::WideStringToMultiByteString(str);
 #else
     const size_t length = wcslen(str) * static_cast<size_t>(MB_CUR_MAX) + 1;
-    char* mbs = new char [length];
+    type_array<char> mbs(length);
 IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_BEGIN()
     const size_t written = wcstombs(mbs, str, length - 1);
     if( written == static_cast<size_t>(-1))
     {
-        delete [] mbs;
         return ToHexString(str, num);
     }
 IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_END()
     mbs[written] = '\0';
-    ::std::string ret = mbs;
-    delete [] mbs;
+    ::std::string ret(mbs);
     return ret;
 #endif
 }
@@ -209,32 +204,27 @@ IUTEST_IPP_INLINE::std::string IUTEST_ATTRIBUTE_UNUSED_ AnyStringToUTF8(const ch
 #if IUTEST_HAS_CXX_HDR_CUCHAR
     IUTEST_UNUSED_VAR(num);
     const size_t length = ::std::char_traits<char16_t>::length(str);
-    char16_t lead = 0, trail = 0;
-    char32_t cp;
-    char mbs[6];
+    char mbs[6] = {};
     mbstate_t state = {};
     IUTEST_CHECK_(mbsinit(&state) != 0);
     ::std::string ret;
 
 IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_BEGIN()
     for( size_t i = 0; i < length; ++i )
     {
-        lead = str[i];
+        const char16_t lead = str[i];
+        char32_t cp = lead;
 
         if( lead > 0xD800 && lead < 0xDC00 )
         {
             ++i;
-            trail = str[i];
+            const char16_t trail = str[i];
             cp = (lead << 10) + trail + 0x10000 - (0xD800 << 10) - 0xDC00;
         }
-        else
-        {
-            cp = lead;
-        }
         const size_t len = ::std::c32rtomb(mbs, cp, &state);
         if( len != static_cast<size_t>(-1) )
         {
-            mbs[len] = '\0';
+            gsl::at(mbs, len) = '\0';
             ret += mbs;
         }
     }
@@ -283,7 +273,7 @@ IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_BEGIN()
         const size_t len = ::std::c32rtomb(mbs, cp, &state);
         if( len != static_cast<size_t>(-1) )
         {
-            mbs[len] = '\0';
+            gsl::at(mbs, len) = '\0';
             ret += mbs;
         }
     }
@@ -302,18 +292,18 @@ IUTEST_IPP_INLINE::std::string IUTEST_ATTRIBUTE_UNUSED_ AnyStringToUTF8(const ch
 {
 #if IUTEST_HAS_CXX_HDR_CUCHAR
     const size_t length = num < 0 ? ::std::char_traits<char32_t>::length(str) : num;
-    char mbs[6];
     mbstate_t state = {};
     IUTEST_CHECK_(mbsinit(&state) != 0);
     ::std::string ret;
 
 IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_BEGIN()
     for( size_t i = 0; i < length; ++i )
     {
+        char mbs[6] = {};
         const size_t len = ::std::c32rtomb(mbs, str[i], &state);
         if( len != static_cast<size_t>(-1) )
         {
-            mbs[len] = '\0';
+            gsl::at(mbs, len) = '\0';
             ret += mbs;
         }
     }
@@ -340,21 +330,19 @@ IUTEST_IPP_INLINE::std::string IUTEST_ATTRIBUTE_UNUSED_ AnyStringToMultiByteStri
 
 IUTEST_IPP_INLINE ::std::wstring IUTEST_ATTRIBUTE_UNUSED_ MultiByteStringToWideString(const char* str)
 {
-    if(str == NULL)
+    if(str == IUTEST_NULLPTR)
     {
         return L"";
     }
     const size_t length = strlen(str) + 1;
-    wchar_t* wcs = new wchar_t[length];
+    type_array<wchar_t> wcs(length);
 IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_BEGIN()
     if(mbstowcs(wcs, str, length) == static_cast<size_t>(-1))
     {
-        delete[] wcs;
         return L"(convert error)";
     }
 IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_END()
-    ::std::wstring ret = wcs;
-    delete[] wcs;
+    ::std::wstring ret(wcs);
     return ret;
 }
 

include/impl/iutest_core.ipp

@@ -6,7 +6,7 @@
  *
  * @author      t.shirayanagi
  * @par         copyright
- * Copyright (C) 2011-2020, Takazumi Shirayanagi\n
+ * Copyright (C) 2011-2022, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */
@@ -22,62 +22,62 @@
 namespace iutest
 {
 
-IUTEST_IPP_INLINE int UnitTest::reportable_test_count() const
+IUTEST_IPP_INLINE int UnitTest::reportable_test_count() const IUTEST_CXX_NOEXCEPT_SPEC
 {
     return detail::SumOverList(m_testsuites, &TestSuite::reportable_test_count);
 }
 
-IUTEST_IPP_INLINE int UnitTest::failed_test_count() const
+IUTEST_IPP_INLINE int UnitTest::failed_test_count() const IUTEST_CXX_NOEXCEPT_SPEC
 {
     return detail::SumOverList(m_testsuites, &TestSuite::failed_test_count);
 }
 
-IUTEST_IPP_INLINE int UnitTest::reportable_disabled_test_count() const
+IUTEST_IPP_INLINE int UnitTest::reportable_disabled_test_count() const IUTEST_CXX_NOEXCEPT_SPEC
 {
     return detail::SumOverList(m_testsuites, &TestSuite::reportable_disabled_test_count);
 }
 
-IUTEST_IPP_INLINE int UnitTest::successful_test_count() const
+IUTEST_IPP_INLINE int UnitTest::successful_test_count() const IUTEST_CXX_NOEXCEPT_SPEC
 {
     return detail::SumOverList(m_testsuites, &TestSuite::successful_test_count);
 }
 
-IUTEST_IPP_INLINE int UnitTest::skip_test_count() const
+IUTEST_IPP_INLINE int UnitTest::skip_test_count() const IUTEST_CXX_NOEXCEPT_SPEC
 {
     return detail::SumOverList(m_testsuites, &TestSuite::skip_test_count);
 }
 
-IUTEST_IPP_INLINE int UnitTest::reportable_skip_test_count() const
+IUTEST_IPP_INLINE int UnitTest::reportable_skip_test_count() const IUTEST_CXX_NOEXCEPT_SPEC
 {
     return detail::SumOverList(m_testsuites, &TestSuite::reportable_skip_test_count);
 }
 
-IUTEST_IPP_INLINE int UnitTest::test_run_skipped_count() const
+IUTEST_IPP_INLINE int UnitTest::test_run_skipped_count() const IUTEST_CXX_NOEXCEPT_SPEC
 {
     return detail::SumOverList(m_testsuites, &TestSuite::test_run_skipped_count);
 }
 
-IUTEST_IPP_INLINE int UnitTest::reportable_test_run_skipped_count() const
+IUTEST_IPP_INLINE int UnitTest::reportable_test_run_skipped_count() const IUTEST_CXX_NOEXCEPT_SPEC
 {
     return detail::SumOverList(m_testsuites, &TestSuite::reportable_test_run_skipped_count);
 }
 
-IUTEST_IPP_INLINE int UnitTest::test_suite_to_run_count() const
+IUTEST_IPP_INLINE int UnitTest::test_suite_to_run_count() const IUTEST_CXX_NOEXCEPT_SPEC
 {
     return detail::CountIfOverList(m_testsuites, &TestSuite::should_run);
 }
 
-IUTEST_IPP_INLINE int UnitTest::successful_test_suite_count() const
+IUTEST_IPP_INLINE int UnitTest::successful_test_suite_count() const IUTEST_CXX_NOEXCEPT_SPEC
 {
     return detail::CountIfOverList(m_testsuites, &TestSuite::Passed);
 }
 
-IUTEST_IPP_INLINE int UnitTest::failed_test_suite_count() const
+IUTEST_IPP_INLINE int UnitTest::failed_test_suite_count() const IUTEST_CXX_NOEXCEPT_SPEC
 {
     return detail::CountIfOverList(m_testsuites, &TestSuite::Failed);
 }
 
-IUTEST_IPP_INLINE bool UnitTest::Passed() const
+IUTEST_IPP_INLINE bool UnitTest::Passed() const IUTEST_CXX_NOEXCEPT_SPEC
 {
     if( m_ad_hoc_testresult.Failed() )
     {
@@ -127,7 +127,8 @@ IUTEST_IPP_INLINE int UnitTest::Run()
         }
         //catch( ::std::exception& e )
         //{
-        //  iutest::AssertionHelper(NULL, -1, detail::FormatCxxException(e.what()), TestPartResult::kFatalFailure) = AssertionHelper::Fixed();
+        //  iutest::AssertionHelper(IUTEST_NULLPTR, -1, detail::FormatCxxException(e.what()), TestPartResult::kFatalFailure)
+        //      = AssertionHelper::Fixed();
         //}
         catch( ... )
         {
@@ -141,7 +142,7 @@ IUTEST_IPP_INLINE int UnitTest::Run()
 #if IUTEST_HAS_SEH && IUTEST_HAS_EXCEPTIONS
 IUTEST_IPP_INLINE int UnitTest::RunOnMSC()
 {
-    _EXCEPTION_POINTERS* ep = NULL;
+    _EXCEPTION_POINTERS* ep = IUTEST_NULLPTR;
     int ret = 1;
     __try
     {
@@ -241,7 +242,7 @@ IUTEST_IPP_INLINE bool UnitTest::RunOnce()
         {
             m_current_testsuite = *it;
             m_current_testsuite->Run();
-            m_current_testsuite = NULL;
+            m_current_testsuite = IUTEST_NULLPTR;
         }
         m_elapsedmsec = sw.stop();
     }
@@ -284,7 +285,7 @@ IUTEST_IPP_INLINE void UnitTest::TestProgramStart()
     listeners().OnTestProgramStart(*this);
 }
 
-IUTEST_IPP_INLINE void UnitTest::SetUpTestIteration()
+IUTEST_IPP_INLINE void UnitTest::SetUpTestIteration() IUTEST_CXX_NOEXCEPT_SPEC
 {
     TestEnv::SetUp();
 }
@@ -315,7 +316,7 @@ IUTEST_IPP_INLINE void UnitTest::TestProgramEnd()
     {
         return;
     }
-    if( current_test_info() != NULL )
+    if( current_test_info() != IUTEST_NULLPTR )
     {
         IUTEST_EXPECT_FAILURE("program exit.");
     }
@@ -330,7 +331,7 @@ IUTEST_IPP_INLINE void UnitTest::Initialize()
     ClearAdHocTestResult();
 
     // ファイルシステムの初期化
-    if( detail::IFileSystem::GetInstance() == NULL )
+    if( detail::IFileSystem::GetInstance() == IUTEST_NULLPTR )
     {
 #if defined(IUTEST_FILE)
         static FileSystem<IUTEST_FILE> filesystem;