From 1612832c30250f5cc37aa39ec1f7d362da5d07f0 Mon Sep 17 00:00:00 2001
From: CrackedMatter <81803926+CrackedMatter@users.noreply.github.com>
Date: Sun, 3 Nov 2024 17:01:26 +0100
Subject: [PATCH 1/2] Use C++ style casts

---
 include/safetyhook/allocator.hpp | 2 +-
 include/safetyhook/utility.hpp   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/safetyhook/allocator.hpp b/include/safetyhook/allocator.hpp
index 83f0326..7a48144 100644
--- a/include/safetyhook/allocator.hpp
+++ b/include/safetyhook/allocator.hpp
@@ -36,7 +36,7 @@ class Allocation final {
 
     /// @brief Returns the address of the allocation.
     /// @return The address of the allocation.
-    [[nodiscard]] uintptr_t address() const noexcept { return (uintptr_t)m_address; }
+    [[nodiscard]] uintptr_t address() const noexcept { return reinterpret_cast<uintptr_t>(m_address); }
 
     /// @brief Returns the size of the allocation.
     /// @return The size of the allocation.
diff --git a/include/safetyhook/utility.hpp b/include/safetyhook/utility.hpp
index 8c982b4..2203329 100644
--- a/include/safetyhook/utility.hpp
+++ b/include/safetyhook/utility.hpp
@@ -42,14 +42,14 @@ class UnprotectMemory {
 [[nodiscard]] std::optional<UnprotectMemory> unprotect(uint8_t* address, size_t size);
 
 template <typename T> constexpr T align_up(T address, size_t align) {
-    const auto unaligned_address = (uintptr_t)address;
+    const auto unaligned_address = reinterpret_cast<uintptr_t>(address);
     const auto aligned_address = (unaligned_address + align - 1) & ~(align - 1);
-    return (T)aligned_address;
+    return reinterpret_cast<T>(aligned_address);
 }
 
 template <typename T> constexpr T align_down(T address, size_t align) {
-    const auto unaligned_address = (uintptr_t)address;
+    const auto unaligned_address = reinterpret_cast<uintptr_t>(address);
     const auto aligned_address = unaligned_address & ~(align - 1);
-    return (T)aligned_address;
+    return reinterpret_cast<T>(aligned_address);
 }
 } // namespace safetyhook

From 6e7cc84a38216a86d13e5f3726acc5f8833d4b11 Mon Sep 17 00:00:00 2001
From: CrackedMatter <81803926+CrackedMatter@users.noreply.github.com>
Date: Mon, 4 Nov 2024 00:37:40 +0100
Subject: [PATCH 2/2] Use static_cast when casting between integer types

---
 include/safetyhook/utility.hpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/include/safetyhook/utility.hpp b/include/safetyhook/utility.hpp
index 2203329..9b24dcb 100644
--- a/include/safetyhook/utility.hpp
+++ b/include/safetyhook/utility.hpp
@@ -14,6 +14,14 @@ template <typename T> constexpr void store(uint8_t* address, const T& value) {
     std::copy_n(reinterpret_cast<const uint8_t*>(&value), sizeof(T), address);
 }
 
+template <typename T> constexpr T address_cast(auto address) {
+    if constexpr (std::is_integral_v<T> && std::is_integral_v<decltype(address)>) {
+        return static_cast<T>(address);
+    } else {
+        return reinterpret_cast<T>(address);
+    }
+}
+
 template <typename T>
 concept FnPtr = requires(T f) { std::is_pointer_v<T>&& std::is_function_v<std::remove_pointer_t<T>>; };
 
@@ -42,14 +50,14 @@ class UnprotectMemory {
 [[nodiscard]] std::optional<UnprotectMemory> unprotect(uint8_t* address, size_t size);
 
 template <typename T> constexpr T align_up(T address, size_t align) {
-    const auto unaligned_address = reinterpret_cast<uintptr_t>(address);
+    const auto unaligned_address = address_cast<uintptr_t>(address);
     const auto aligned_address = (unaligned_address + align - 1) & ~(align - 1);
-    return reinterpret_cast<T>(aligned_address);
+    return address_cast<T>(aligned_address);
 }
 
 template <typename T> constexpr T align_down(T address, size_t align) {
-    const auto unaligned_address = reinterpret_cast<uintptr_t>(address);
+    const auto unaligned_address = address_cast<uintptr_t>(address);
     const auto aligned_address = unaligned_address & ~(align - 1);
-    return reinterpret_cast<T>(aligned_address);
+    return address_cast<T>(aligned_address);
 }
 } // namespace safetyhook