From 846eda836f79f68daf83e308c785c90a61e68b50 Mon Sep 17 00:00:00 2001 From: sum2012 Date: Sat, 21 Jun 2014 05:44:29 +0800 Subject: [PATCH 1/2] Add a codecType check in sceAtracSetHalfwayBufferAndGetID Fix crash in #6363 --- Core/HLE/sceAtrac.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 16c146b307..4d9682cdbb 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -1311,7 +1311,10 @@ int sceAtracSetHalfwayBufferAndGetID(u32 halfBuffer, u32 readSize, u32 halfBuffe return ATRAC_ERROR_INCORRECT_READ_SIZE; } int codecType = getCodecType(halfBuffer); - + if (codecType == 0) { + ERROR_LOG(ME, "sceAtracSetHalfwayBufferAndGetID(%08x, %08x, %08x): ATRAC_UNKNOWN_FORMAT", halfBuffer, readSize, halfBufferSize); + return ATRAC_ERROR_UNKNOWN_FORMAT; + } Atrac *atrac = new Atrac(); atrac->first.addr = halfBuffer; atrac->first.size = readSize; From 6fe74d938e96e46acc04c61246e442c5ac7bedf8 Mon Sep 17 00:00:00 2001 From: sum2012 Date: Sat, 21 Jun 2014 08:00:16 +0800 Subject: [PATCH 2/2] Change to report --- Core/HLE/sceAtrac.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 4d9682cdbb..b06a2baac9 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -1312,7 +1312,7 @@ int sceAtracSetHalfwayBufferAndGetID(u32 halfBuffer, u32 readSize, u32 halfBuffe } int codecType = getCodecType(halfBuffer); if (codecType == 0) { - ERROR_LOG(ME, "sceAtracSetHalfwayBufferAndGetID(%08x, %08x, %08x): ATRAC_UNKNOWN_FORMAT", halfBuffer, readSize, halfBufferSize); + ERROR_LOG_REPORT(ME, "sceAtracSetHalfwayBufferAndGetID(%08x, %08x, %08x): ATRAC UNKNOWN FORMAT", halfBuffer, readSize, halfBufferSize); return ATRAC_ERROR_UNKNOWN_FORMAT; } Atrac *atrac = new Atrac();