piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't use GetPointer in DVDRead

Browse Source
This commit is contained in:
JosJuice
2015-04-22 17:18:00 +02:00
parent e3b9e89f5a
commit 1202c2ea35
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/Boot/Boot.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <vector>
#include "Common/CommonPaths.h" #include "Common/CommonPaths.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
@ -34,7 +35,11 @@
bool CBoot::DVDRead(u64 dvd_offset, u32 output_address, u32 length, bool decrypt) bool CBoot::DVDRead(u64 dvd_offset, u32 output_address, u32 length, bool decrypt)
{ {
return DVDInterface::GetVolume().Read(dvd_offset, length, Memory::GetPointer(output_address), decrypt); std::vector<u8> buffer(length);
if (!DVDInterface::GetVolume().Read(dvd_offset, length, buffer.data(), decrypt))
return false;
Memory::CopyToEmu(output_address, buffer.data(), length);
return true;
} }
void CBoot::Load_FST(bool _bIsWii) void CBoot::Load_FST(bool _bIsWii)