archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 22:41:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix games passing invalid npids

Browse source
This commit is contained in:
RipleyTom 2024-01-08 21:38:42 +01:00 • committed by Megamouse
parent 7504503d5f
commit 067ea68979
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/Emu/NP/rpcn_client.cpp
View file

@ -1413,6 +1413,13 @@ namespace rpcn
std::vector<flatbuffers::Offset<flatbuffers::String>> davec; std::vector<flatbuffers::Offset<flatbuffers::String>> davec;
for (u32 i = 0; i < req->allowedUserNum; i++) for (u32 i = 0; i < req->allowedUserNum; i++)
{ {
// Some games just give us garbage, make sure npid is valid before passing
// Ex: Aquapazza (gives uninitialized buffer on the stack and allowedUserNum is hardcoded to 100)
if (!np::is_valid_npid(req->allowedUser[i]))
{
continue;
}
auto bin = builder.CreateString(req->allowedUser[i].handle.data); auto bin = builder.CreateString(req->allowedUser[i].handle.data);
davec.push_back(bin); davec.push_back(bin);
} }
@ -1424,6 +1431,11 @@ namespace rpcn
std::vector<flatbuffers::Offset<flatbuffers::String>> davec; std::vector<flatbuffers::Offset<flatbuffers::String>> davec;
for (u32 i = 0; i < req->blockedUserNum; i++) for (u32 i = 0; i < req->blockedUserNum; i++)
{ {
if (!np::is_valid_npid(req->blockedUser[i]))
{
continue;
}
auto bin = builder.CreateString(req->blockedUser[i].handle.data); auto bin = builder.CreateString(req->blockedUser[i].handle.data);
davec.push_back(bin); davec.push_back(bin);
} }