Merge pull request #138 from cristian64/fortify_source_warnings

Address `-Wfortify-source` warnings.
aldelaro5 · May 15, 2024 · 8e5fd21 · 8e5fd21
2 parents 4c94370 + 11e56d6
commit 8e5fd21
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 29 deletions.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -75,7 +75,6 @@ endif ()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
     add_compile_options(
-        -Wno-fortify-source   # FIXME(CA): Too verbose at the moment, but worth fixing
         -Wno-sign-conversion  # FIXME(CA): Too verbose at the moment, but worth fixing
     )
 endif ()

diff --git a/Source/MemoryScanner/MemoryScanner.h b/Source/MemoryScanner/MemoryScanner.h
@@ -75,54 +75,45 @@ class MemScanner
     T secondByte;
     std::memcpy(&firstByte, first, sizeof(T));
     std::memcpy(&secondByte, second, sizeof(T));
-    size_t size = sizeof(T);
-    switch (size)
-    {
-    case 2:
+
+    constexpr size_t size{sizeof(T)};
+    static_assert(size == 1 || size == 2 || size == 4 || size == 8, "Unexpected type size");
+
+    if constexpr (size == 2)
     {
-      u16 firstHalfword = 0;
-      std::memcpy(&firstHalfword, &firstByte, sizeof(u16));
+      u16 firstHalfword = Common::bit_cast<u16, T>(firstByte);
       firstHalfword = Common::bSwap16(firstHalfword);
-      std::memcpy(&firstByte, &firstHalfword, sizeof(u16));
+      firstByte = Common::bit_cast<T, u16>(firstHalfword);
       if (bswapSecond)
       {
-        std::memcpy(&firstHalfword, &secondByte, sizeof(u16));
+        firstHalfword = Common::bit_cast<u16, T>(secondByte);
         firstHalfword = Common::bSwap16(firstHalfword);
-        std::memcpy(&secondByte, &firstHalfword, sizeof(u16));
+        secondByte = Common::bit_cast<T, u16>(firstHalfword);
       }
-      break;
     }
-    case 4:
+    else if constexpr (size == 4)
     {
-      u32 firstWord = 0;
-      std::memcpy(&firstWord, &firstByte, sizeof(u32));
+      u32 firstWord = Common::bit_cast<u32, T>(firstByte);
       firstWord = Common::bSwap32(firstWord);
-      std::memcpy(&firstByte, &firstWord, sizeof(u32));
+      firstByte = Common::bit_cast<T, u32>(firstWord);
       if (bswapSecond)
       {
-        std::memcpy(&firstWord, &secondByte, sizeof(u32));
+        firstWord = Common::bit_cast<u32, T>(secondByte);
         firstWord = Common::bSwap32(firstWord);
-        std::memcpy(&secondByte, &firstWord, sizeof(u32));
+        secondByte = Common::bit_cast<T, u32>(firstWord);
       }
-      break;
     }
-    case 8:
+    else if constexpr (size == 8)
     {
-      u64 firstDoubleword = 0;
-      std::memcpy(&firstDoubleword, &firstByte, sizeof(u64));
+      u64 firstDoubleword = Common::bit_cast<u64, T>(firstByte);
       firstDoubleword = Common::bSwap64(firstDoubleword);
-      std::memcpy(&firstByte, &firstDoubleword, sizeof(u64));
+      firstByte = Common::bit_cast<T, u64>(firstDoubleword);
       if (bswapSecond)
       {
-        std::memcpy(&firstDoubleword, &secondByte, sizeof(u64));
+        firstDoubleword = Common::bit_cast<u64, T>(secondByte);
         firstDoubleword = Common::bSwap64(firstDoubleword);
-        std::memcpy(&secondByte, &firstDoubleword, sizeof(u64));
+        secondByte = Common::bit_cast<T, u64>(firstDoubleword);
       }
-      break;
-    }
-    default:
-      assert(0 && "Unexpected type size");
-      break;
     }
 
     if constexpr (std::is_floating_point<T>::value)