vm_ptr: return nullptr and add some nullptr deref checks

RPCS3 · Jun 11, 2024 · 632b74b · 632b74b
1 parent 1e5cd7f
commit 632b74b
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/rpcs3/Emu/Memory/vm_ptr.h b/rpcs3/Emu/Memory/vm_ptr.h
@@ -101,23 +101,31 @@ namespace vm
 			return vm::cast(m_addr);
 		}
 
+		template <bool Strict = false>
 		T* get_ptr() const
 		{
+			if constexpr (Strict)
+			{
+				AUDIT(mAddr);
+			}
+
 			return static_cast<T*>(vm::base(vm::cast(m_addr)));
 		}
 
 		T* operator ->() const requires (!std::is_void_v<T>)
 		{
-			return get_ptr();
+			return get_ptr<true>();
 		}
 
 		std::add_lvalue_reference_t<T> operator *() const requires (!std::is_void_v<T>)
 		{
-			return *static_cast<T*>(vm::base(vm::cast(m_addr)));
+			return *get_ptr<true>();
 		}
 
 		std::add_lvalue_reference_t<T> operator [](u32 index) const requires (!std::is_void_v<T>)
 		{
+			AUDIT(mAddr);
+
 			return *static_cast<T*>(vm::base(vm::cast(m_addr) + u32{sizeof(T)} * index));
 		}