From 5e6902e8d5a1b5ecb45a0bf8e5f31d6389a46468 Mon Sep 17 00:00:00 2001 From: David Marcec Date: Sun, 28 Jun 2020 17:14:23 +1000 Subject: [PATCH] Fix nullptr deref for rebased method --- src/video_core/macro/macro.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video_core/macro/macro.cpp b/src/video_core/macro/macro.cpp index 7bdc93120d..a50e7b4e0b 100644 --- a/src/video_core/macro/macro.cpp +++ b/src/video_core/macro/macro.cpp @@ -57,7 +57,7 @@ void MacroEngine::Execute(Engines::Maxwell3D& maxwell3d, u32 method, cache_info.hash = boost::hash_value(macro_code->second); } else { const auto& macro_cached = uploaded_macro_code[mid_method.value()]; - const auto rebased_method = method - macro_code->first; + const auto rebased_method = method - mid_method.value(); auto& code = uploaded_macro_code[method]; code.resize(macro_cached.size() - rebased_method); std::memcpy(code.data(), macro_cached.data() + rebased_method,