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

Merge pull request #15990 from hrydgard/atrac3plus-crash-workaround

Browse Source 
Atrac3+: Allocate some extra bytes for the data buffer to workaround decoder bug.
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2022-09-09 10:25:41 +02:00
2 parents f3c097680e 818334c592
commit bbba18ad60
1 file changed
+6 -1
Download Patch File Download Diff File Expand all files Collapse all files
Core/HLE/sceAtrac.cpp
+6 -1
View File
@@ -1948,7 +1948,12 @@ static int _AtracSetData(Atrac *atrac, u32 buffer, u32 readSize, u32 bufferSize,
const char *codecName = atrac->codecType_ == PSP_MODE_AT_3 ? "atrac3" : "atrac3+";
const char *channelName = atrac->channels_ == 1 ? "mono" : "stereo";
atrac->dataBuf_ = new u8[atrac->first_.filesize];
// Over-allocate databuf to prevent going off the end if the bitstream is bad or if there are
// bugs in the decoder. This happens, see issue #15788. Arbitrary, but let's make it a whole page on the popular
// architecture that has the largest pages (M1).
const size_t overAllocBytes = 16384;
atrac->dataBuf_ = new u8[atrac->first_.filesize + overAllocBytes];
memset(atrac->dataBuf_, 0, atrac->first_.filesize + overAllocBytes);
if (!atrac->ignoreDataBuf_) {
u32 copybytes = std::min(bufferSize, atrac->first_.filesize);
Memory::Memcpy(atrac->dataBuf_, buffer, copybytes, "AtracSetData");