preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-22 10:49:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

sceChnnlsv: Allow no key in sceSdGetLastIndex and sceSdCreateList

Browse Source 
Both took their key through GetPointerWriteOrException, which raises a
memory exception for 0, though the code behind them treats a null key
as no key. The VSH's Saved Data Utility checks PARAM.SFO hashes without
one, and emulation stopped there.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Henrik RydgårdandClaude Opus 5.5 committed 2026-10-21 19:00:01 +02:00
1 parent 8d6a0134c6
commit cf29cbdfd7
1 file changed
+5 -2
Download Patch File Download Diff File Expand all files Collapse all files
Core/HLE/sceChnnlsv.cpp
+5 -2
View File
@@ -226,7 +226,9 @@ static int sceSdGetLastIndex(u32 addressCtx, u32 addressHash, u32 addressKey) {
u8 *hash = Memory::GetPointerWriteOrException(addressHash);
if (!ctx.IsValid() || !hash)
return hleLogError(Log::sceMisc, 0, "Invalid pointer");
return hleLogDebug(Log::sceMisc, sceSdMacFinal(*ctx, hash, Memory::GetPointerWriteOrException(addressKey)));
// The key is optional: the VSH's Saved Data Utility checks PARAM.SFO hashes with none.
const u8 *key = addressKey ? Memory::GetPointerWriteOrException(addressKey) : nullptr;
return hleLogDebug(Log::sceMisc, sceSdMacFinal(*ctx, hash, key));
}
int sceSdMacFinal(pspChnnlsvContext1& ctx, u8* in_hash, const u8* in_key)
@@ -402,7 +404,8 @@ int sceSdMacUpdate(pspChnnlsvContext1& ctx, const u8* data, int length)
static int sceSdCreateList(u32 ctx2Addr, int mode, int unkwn, u32 dataAddr, u32 cryptkeyAddr) {
auto ctx2 = PSPPointer<pspChnnlsvContext2>::Create(ctx2Addr);
u8* data = Memory::GetPointerWriteOrException(dataAddr);
u8* cryptkey = Memory::GetPointerWriteOrException(cryptkeyAddr);
// Optional, as in sceSdGetLastIndex.
u8* cryptkey = cryptkeyAddr ? Memory::GetPointerWriteOrException(cryptkeyAddr) : nullptr;
if (!ctx2.IsValid() || !data)
return hleLogError(Log::sceMisc, 0, "Invalid pointer");