Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Atrac: Allow data to extend outside RIFF size.

Browse source 
This seems technically incorrect, but it's allowed on the PSP, possibly
intentionally due to data shipped truncated by accident?
This commit is contained in:
Unknown W. Brackets 2015-10-18 13:33:26 -07:00
parent 522a1743f4
commit 596ecdc431
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Core/HLE/sceAtrac.cpp
View file

@ -568,10 +568,12 @@ int Atrac::Analyze() {
// RIFF size excluding chunk header.
first.filesize = Memory::Read_U32(first.addr + offset - 8) + 8;
// Even if the RIFF size is too low, it may simply be incorrect. This works on real firmware.
u32 maxSize = std::max(first.filesize, first.size);
this->decodeEnd = first.filesize;
decodeEnd = first.filesize;
bool bfoundData = false;
while (first.filesize >= offset + 8 && !bfoundData) {
while (maxSize >= offset + 8 && !bfoundData) {
int chunkMagic = Memory::Read_U32(first.addr + offset);
u32 chunkSize = Memory::Read_U32(first.addr + offset + 4);
// Account for odd sized chunks.
@ -580,7 +582,7 @@ int Atrac::Analyze() {
}
chunkSize += (chunkSize & 1);
offset += 8;
if (chunkSize > first.filesize - offset)
if (chunkSize > maxSize - offset)
break;
switch (chunkMagic) {
case FMT_CHUNK_MAGIC:
@ -668,6 +670,11 @@ int Atrac::Analyze() {
{
bfoundData = true;
dataOff = offset;
if (first.filesize < offset + chunkSize) {
WARN_LOG_REPORT(ME, "Atrac data chunk extends beyond riff chunk");
first.filesize = offset + chunkSize;
decodeEnd = offset + chunkSize;
}
}
break;
}