VERY experimental Nintendo Switch 2 emulator
C++
am: avoid direct pointer access of transfer memory objects
Liamb88b27fdf50f
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cppindex beb2da06ee..adb4829410 100644--- a/src/core/hle/service/am/am.cpp+++ b/src/core/hle/service/am/am.cpp@@ -1260,9 +1260,8 @@ void ILibraryAppletCreator::CreateTransferMemoryStorage(Kernel::HLERequestContexreturn;}- const u8* const mem_begin = system.Memory().GetPointer(transfer_mem->GetSourceAddress());- const u8* const mem_end = mem_begin + transfer_mem->GetSize();- std::vector<u8> memory{mem_begin, mem_end};+ std::vector<u8> memory(transfer_mem->GetSize());+ system.Memory().ReadBlock(transfer_mem->GetSourceAddress(), memory.data(), memory.size());IPC::ResponseBuilder rb{ctx, 2, 0, 1};rb.Push(ResultSuccess);@@ -1294,9 +1293,8 @@ void ILibraryAppletCreator::CreateHandleStorage(Kernel::HLERequestContext& ctx)return;}- const u8* const mem_begin = system.Memory().GetPointer(transfer_mem->GetSourceAddress());- const u8* const mem_end = mem_begin + transfer_mem->GetSize();- std::vector<u8> memory{mem_begin, mem_end};+ std::vector<u8> memory(transfer_mem->GetSize());+ system.Memory().ReadBlock(transfer_mem->GetSourceAddress(), memory.data(), memory.size());IPC::ResponseBuilder rb{ctx, 2, 0, 1};rb.Push(ResultSuccess);