preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20149 from hrydgard/tomb-raider-atrac-fix

Browse Source 
Fix regression in Tomb Raider Legends
This commit is contained in:
Henrik Rydgård
2025-03-23 07:57:31 +01:00
committed by GitHub
parent 22fe190170 2b558eb545
commit ca1819fe85
3 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/HLE/sceAtrac.cpp
+12 -10
View File
@@ -637,7 +637,7 @@ static u32 sceAtracSetHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u32 b
Track track;
std::string error;
int ret = AnalyzeAtracTrack(Memory::GetPointer(buffer), readSize, &track, &error);
int ret = AnalyzeAtracTrack(Memory::GetPointerOrNull(buffer), readSize, &track, &error);
if (ret < 0) {
return hleLogError(Log::ME, ret, "%s", error.c_str());
}
@@ -673,7 +673,7 @@ static u32 sceAtracSetData(int atracID, u32 buffer, u32 bufferSize) {
Track track;
std::string error;
int ret = AnalyzeAtracTrack(Memory::GetPointer(buffer), bufferSize, &track, &error);
int ret = AnalyzeAtracTrack(Memory::GetPointerOrNull(buffer), bufferSize, &track, &error);
if (ret < 0) {
return hleLogError(Log::ME, ret, "%s", error.c_str());
}
@@ -701,7 +701,9 @@ static int sceAtracSetDataAndGetID(u32 buffer, int bufferSize) {
Track track;
std::string error;
int ret = AnalyzeAtracTrack(Memory::GetPointer(buffer), bufferSize, &track, &error);
// We let zero-pointer through as zeroes, so the small size check can kick in before it's accessed.
// This is needed in Tomb Raider Legend (#20145).
int ret = AnalyzeAtracTrack(Memory::GetPointerOrNull(buffer), bufferSize, &track, &error);
if (ret < 0) {
return hleLogError(Log::ME, ret, "%s", error.c_str());
}
@@ -727,7 +729,7 @@ static int sceAtracSetHalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 buffer
Track track;
std::string error;
int ret = AnalyzeAtracTrack(Memory::GetPointer(buffer), readSize, &track, &error);
int ret = AnalyzeAtracTrack(Memory::GetPointerOrNull(buffer), readSize, &track, &error);
if (ret < 0) {
return hleLogError(Log::ME, ret, "%s", error.c_str());
}
@@ -847,7 +849,7 @@ static int sceAtracSetMOutHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u
Track track;
std::string error;
int ret = AnalyzeAtracTrack(Memory::GetPointer(buffer), readSize, &track, &error);
int ret = AnalyzeAtracTrack(Memory::GetPointerOrNull(buffer), readSize, &track, &error);
if (ret < 0) {
return hleLogError(Log::ME, ret, "%s", error.c_str());
}
@@ -872,7 +874,7 @@ static u32 sceAtracSetMOutData(int atracID, u32 buffer, u32 bufferSize) {
Track track;
std::string error;
int ret = AnalyzeAtracTrack(Memory::GetPointer(buffer), bufferSize, &track, &error);
int ret = AnalyzeAtracTrack(Memory::GetPointerOrNull(buffer), bufferSize, &track, &error);
if (ret < 0) {
return hleLogError(Log::ME, ret, "%s", error.c_str());
}
@@ -891,7 +893,7 @@ static u32 sceAtracSetMOutData(int atracID, u32 buffer, u32 bufferSize) {
static int sceAtracSetMOutDataAndGetID(u32 buffer, u32 bufferSize) {
Track track;
std::string error;
int ret = AnalyzeAtracTrack(Memory::GetPointer(buffer), bufferSize, &track, &error);
int ret = AnalyzeAtracTrack(Memory::GetPointerOrNull(buffer), bufferSize, &track, &error);
if (ret < 0) {
return hleLogError(Log::ME, ret, "%s", error.c_str());
}
@@ -920,7 +922,7 @@ static int sceAtracSetMOutHalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 bu
Track track;
std::string error;
int ret = AnalyzeAtracTrack(Memory::GetPointer(buffer), readSize, &track, &error);
int ret = AnalyzeAtracTrack(Memory::GetPointerOrNull(buffer), readSize, &track, &error);
if (ret < 0) {
return hleLogError(Log::ME, ret, "%s", error.c_str());
}
@@ -945,7 +947,7 @@ static int sceAtracSetMOutHalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 bu
static int sceAtracSetAA3DataAndGetID(u32 buffer, u32 bufferSize, u32 fileSize, u32 metadataSizeAddr) {
Track track;
std::string error;
int ret = AnalyzeAtracTrack(Memory::GetPointer(buffer), bufferSize, &track, &error);
int ret = AnalyzeAtracTrack(Memory::GetPointerOrNull(buffer), bufferSize, &track, &error);
if (ret < 0) {
return hleLogError(Log::ME, ret, "%s", error.c_str());
}
@@ -971,7 +973,7 @@ static int sceAtracSetAA3HalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 buf
Track track;
std::string error;
int ret = AnalyzeAtracTrack(Memory::GetPointer(buffer), readSize, &track, &error);
int ret = AnalyzeAtracTrack(Memory::GetPointerOrNull(buffer), readSize, &track, &error);
if (ret < 0) {
return hleLogError(Log::ME, ret, "%s", error.c_str());
}
Core/MemMap.h
+5
View File
@@ -396,6 +396,11 @@ inline u32 GetAddressFromHostPointer(const void* host_ptr) {
return address;
}
// Like GetPointer, but bad values don't result in a memory exception, instead nullptr is returned.
inline const u8* GetPointerOrNull(const u32 address) {
return IsValidAddress(address) ? GetPointerUnchecked(address) : nullptr;
}
} // namespace Memory
// Avoiding a global include for NotifyMemInfo.
Core/Util/AtracTrack.cpp
+18 -1
View File
@@ -25,6 +25,16 @@ static u32 Read32(const u8 *buffer, int offset) {
int AnalyzeAtracTrack(const u8 *buffer, u32 size, Track *track, std::string *error) {
// 72 is about the size of the minimum required data to even be valid.
if (size < 72) {
return SCE_ERROR_ATRAC_SIZE_TOO_SMALL;
}
// If the pointer is bad, let's try to survive, although I'm pretty sure that on a real PSP,
// we crash here.
if (!buffer) {
_dbg_assert_(false);
return SCE_KERNEL_ERROR_INVALID_POINTER;
}
// TODO: Validate stuff more.
if (Read32(buffer, 0) != RIFF_CHUNK_MAGIC) {
@@ -238,10 +248,17 @@ int AnalyzeAtracTrack(const u8 *buffer, u32 size, Track *track, std::string *err
}
int AnalyzeAA3Track(const u8 *buffer, u32 size, u32 fileSize, Track *track, std::string *error) {
// TODO: Make sure this validation is correct, more testing.
if (size < 10) {
return SCE_ERROR_ATRAC_AA3_SIZE_TOO_SMALL;
}
// TODO: Make sure this validation is correct, more testing.
// If the pointer is bad, let's try to survive, although I'm pretty sure that on a real PSP,
// we crash here.
if (!buffer) {
_dbg_assert_(false);
return SCE_KERNEL_ERROR_INVALID_POINTER;
}
if (buffer[0] != 'e' || buffer[1] != 'a' || buffer[2] != '3') {
return SCE_ERROR_ATRAC_AA3_INVALID_DATA;