ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sceNpDrm: improve error handling of rap files

This commit is contained in:
Megamouse 2023-12-19 01:13:59 +01:00
parent 8591529aad
commit d08c7a9b96
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcs3/Emu/Cell/Modules/sceNp.cpp
View File

@ -531,13 +531,19 @@ error_code npDrmIsAvailable(vm::cptr<u8> k_licensee_addr, vm::cptr<char> drm_pat
{ {
const std::string rap_file = rpcs3::utils::get_rap_file_path(npd.content_id); const std::string rap_file = rpcs3::utils::get_rap_file_path(npd.content_id);
if (fs::file rap_fd{rap_file}; rap_fd && rap_fd.size() >= sizeof(u128)) if (fs::file rap_fd{rap_file})
{ {
if (rap_fd.size() < sizeof(u128))
{
sceNp.error("npDrmIsAvailable(): Rap file too small: '%s' (%d bytes)", rap_file, rap_fd.size());
return {SCE_NP_DRM_ERROR_BAD_FORMAT, enc_drm_path};
}
npdrmkeys.install_decryption_key(GetEdatRifKeyFromRapFile(rap_fd)); npdrmkeys.install_decryption_key(GetEdatRifKeyFromRapFile(rap_fd));
} }
else else
{ {
sceNp.error(u8"npDrmIsAvailable(): Rap file not found: “%s”", rap_file); sceNp.error("npDrmIsAvailable(): Rap file not found: '%s' (%s)", rap_file, fs::g_tls_error);
return {SCE_NP_DRM_ERROR_LICENSE_NOT_FOUND, enc_drm_path}; return {SCE_NP_DRM_ERROR_LICENSE_NOT_FOUND, enc_drm_path};
} }
} }