From 19bc90845ff60f7aecd0442e7621532531faaa06 Mon Sep 17 00:00:00 2001
From: Kah Wei <msntkw@msn.com>
Date: Wed, 16 Nov 2022 21:01:51 +0800
Subject: [PATCH] Added additional checks for SetProperty() of Material and
 MaterialInstance

---
 .../src/Graphics/MiddleEnd/Interface/SHMaterial.hpp         | 5 +++++
 .../src/Graphics/MiddleEnd/Interface/SHMaterialInstance.hpp | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMaterial.hpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMaterial.hpp
index b74a69b0..880fba69 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMaterial.hpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMaterial.hpp
@@ -84,6 +84,11 @@ namespace SHADE
     template<typename T>
     void SHMaterial::setPropertyUnsafe(uint32_t memOffset, const T& value)
     {
+        // Size check
+        if (memOffset + sizeof(T) > propMemorySize)
+        {
+          throw std::runtime_error("Attempted to write to out of bounds MaterialInstance properties memory");
+        }
         (*reinterpret_cast<T*>(propMemory.get() + memOffset)) = value;
         propertiesChanged = true;
     }
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMaterialInstance.hpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMaterialInstance.hpp
index 3805cc72..7bd1c106 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMaterialInstance.hpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMaterialInstance.hpp
@@ -59,6 +59,12 @@ namespace SHADE
         od.StoredDataOffset = lastInsertedData.StoredDataOffset + lastInsertedData.DataSize;
       }
 
+      // Size check
+      if (od.StoredDataOffset + sizeof(T) > dataStoreSize)
+      {
+        throw std::runtime_error("Attempted to write to out of bounds MaterialInstance properties memory");
+      }
+
       // Save the override data information
       overrideData.emplace_back(std::move(od));
       existingOverride = overrideData.end() - 1;