From f649364b2de6f02c3bfa936b4caf942c19f84beb Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 18 May 2013 12:05:02 -0700 Subject: [PATCH] Add a null check to scePsmfPlayerGetAudioData(). Crimson Gem Saga was passing a NULL, maybe a glitch, but we do NULL checks elsewhere. --- Core/HLE/scePsmf.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Core/HLE/scePsmf.cpp b/Core/HLE/scePsmf.cpp index 0550d2fed0..634666d8aa 100644 --- a/Core/HLE/scePsmf.cpp +++ b/Core/HLE/scePsmf.cpp @@ -779,7 +779,8 @@ int scePsmfPlayerGetAudioData(u32 psmfPlayer, u32 audioDataAddr) return ERROR_PSMF_NOT_FOUND; } - Memory::Memset(audioDataAddr, 0, audioSamplesBytes); + if (Memory::IsValidAddress(audioDataAddr)) + Memory::Memset(audioDataAddr, 0, audioSamplesBytes); return 0; }