RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 18:53:28 +01:00
Code Issues Releases Wiki Activity

vm_ptr: return nullptr and add some nullptr deref checks

Browse Source
This commit is contained in:
Megamouse 2024-06-11 23:59:40 +02:00 committed by Elad Ashkenazi
parent 8d6c957cbc
commit b0d4858e42
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpcs3/Emu/Memory/vm_ptr.h
View File

@ -101,23 +101,31 @@ namespace vm
return vm::cast(m_addr);
}
template <bool Strict = false>
T* get_ptr() const
{
if constexpr (Strict)
{
AUDIT(m_addr);
}
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(m_addr);
return *static_cast<T*>(vm::base(vm::cast(m_addr) + u32{sizeof(T)} * index));
}