From 2935c9d8dede082220b09b0084195bb78361d095 Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 14 Jan 2022 23:22:06 -0800 Subject: core: hle: kernel: KPageTable: Assert valid address on GetPhysicalAddr. --- src/core/hle/kernel/k_page_table.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/hle/kernel/k_page_table.h b/src/core/hle/kernel/k_page_table.h index e57d225e6..60ae9b9e8 100644 --- a/src/core/hle/kernel/k_page_table.h +++ b/src/core/hle/kernel/k_page_table.h @@ -248,7 +248,9 @@ public: return !IsOutsideASLRRegion(address, size); } constexpr PAddr GetPhysicalAddr(VAddr addr) { - return page_table_impl.backing_addr[addr >> PageBits] + addr; + const auto backing_addr = page_table_impl.backing_addr[addr >> PageBits]; + ASSERT(backing_addr); + return backing_addr + addr; } constexpr bool Contains(VAddr addr) const { return address_space_start <= addr && addr <= address_space_end - 1; -- cgit v1.2.3