From 1202c2ea35a5c16c0b9f1b8fd0898e9a5b473ec4 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Wed, 22 Apr 2015 17:18:00 +0200 Subject: [PATCH] Don't use GetPointer in DVDRead --- Source/Core/Core/Boot/Boot.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp index d4aa35b653..3e58c33db9 100644 --- a/Source/Core/Core/Boot/Boot.cpp +++ b/Source/Core/Core/Boot/Boot.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" @@ -34,7 +35,11 @@ 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 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)