From f47333997fc8deb556dee328826d33ae1df10a73 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sun, 9 Feb 2020 16:21:47 +0300 Subject: [PATCH] rsx: Validate memory blocks before checking for overlap --- rpcs3/Emu/RSX/Common/surface_store.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/RSX/Common/surface_store.h b/rpcs3/Emu/RSX/Common/surface_store.h index 7d4cc2aa3e..71d70f87bd 100644 --- a/rpcs3/Emu/RSX/Common/surface_store.h +++ b/rpcs3/Emu/RSX/Common/surface_store.h @@ -898,12 +898,14 @@ namespace rsx // Range test helper to quickly discard blocks // Fortunately, render targets tend to be clustered anyway - if (test_range.overlaps(m_render_targets_memory_range)) + if (m_render_targets_memory_range.valid() && + test_range.overlaps(m_render_targets_memory_range)) { process_list_function(m_render_targets_storage, false); } - if (test_range.overlaps(m_depth_stencil_memory_range)) + if (m_depth_stencil_memory_range.valid() && + test_range.overlaps(m_depth_stencil_memory_range)) { process_list_function(m_depth_stencil_storage, true); }