diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-02-27 19:46:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-27 19:46:10 -0500 |
| commit | 22432668be6d34b5a5275bcc631cadf512f36bf9 (patch) | |
| tree | 88aeebd3448ad8fa701914839c0b1f3c876c62ac /src/core/hle/service/am/am.cpp | |
| parent | 50575c317e9d92d5c269bf7920cbbd286d50f476 (diff) | |
| parent | 975186ad4d7c67b22f580986979d0520530b41c3 (diff) | |
Merge pull request #9859 from liamwhite/tmem-use
service: avoid direct pointer access of transfer memory objects
Diffstat (limited to 'src/core/hle/service/am/am.cpp')
| -rw-r--r-- | src/core/hle/service/am/am.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 26af499d2..9a7316e27 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -1264,9 +1264,8 @@ void ILibraryAppletCreator::CreateTransferMemoryStorage(Kernel::HLERequestContex 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); @@ -1298,9 +1297,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); |