midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FileSys/Path: Replace Memory::GetPointer with Memory::ReadBlock

Browse Source
This commit is contained in:
MerryMage 2016-04-16 10:01:43 +01:00 committed by Subv
parent b3b3dd7591
commit 2be17a0c6e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/file_sys/archive_backend.cpp
View File

@ -19,22 +19,22 @@ Path::Path(LowPathType type, u32 size, u32 pointer) : type(type) {
switch (type) { switch (type) {
case Binary: case Binary:
{ {
u8* data = Memory::GetPointer(pointer); binary.resize(size);
binary = std::vector<u8>(data, data + size); Memory::ReadBlock(pointer, binary.data(), binary.size());
break; break;
} }
case Char: case Char:
{ {
const char* data = reinterpret_cast<const char*>(Memory::GetPointer(pointer)); string.resize(size - 1); // Data is always null-terminated.
string = std::string(data, size - 1); // Data is always null-terminated. Memory::ReadBlock(pointer, &string[0], string.size());
break; break;
} }
case Wchar: case Wchar:
{ {
const char16_t* data = reinterpret_cast<const char16_t*>(Memory::GetPointer(pointer)); u16str.resize(size / 2 - 1); // Data is always null-terminated.
u16str = std::u16string(data, size/2 - 1); // Data is always null-terminated. Memory::ReadBlock(pointer, &u16str[0], u16str.size() * sizeof(char16_t));
break; break;
} }