mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-15 22:53:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not set the data size in sceNpBasicGetEvent for SCE_NP_BASIC_EVENT_OFFLINE

Browse Source 
There is no data associated with this event,
size is not supposed to be set.
This commit is contained in:
Silent 2024-07-17 19:00:01 +02:00 committed by Elad Ashkenazi
parent ebcb403411
commit 9e094fded6
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rpcs3/Emu/NP/np_handler.cpp
View File

@ -978,17 +978,20 @@ namespace np
queue_basic_events.pop(); queue_basic_events.pop();
} }
const u32 size_avail = *size;
u32 res_size = std::min(static_cast<u32>(cur_event.data.size()), size_avail);
*event = cur_event.event; *event = cur_event.event;
memcpy(from.get_ptr(), &cur_event.from, sizeof(cur_event.from)); memcpy(from.get_ptr(), &cur_event.from, sizeof(cur_event.from));
memcpy(data.get_ptr(), cur_event.data.data(), res_size); if (cur_event.event != SCE_NP_BASIC_EVENT_OFFLINE)
*size = res_size;
if (res_size < cur_event.data.size())
{ {
return SCE_NP_BASIC_ERROR_DATA_LOST; const u32 size_avail = *size;
const u32 res_size = std::min(static_cast<u32>(cur_event.data.size()), size_avail);
memcpy(data.get_ptr(), cur_event.data.data(), res_size);
*size = res_size;
if (res_size < cur_event.data.size())
{
return SCE_NP_BASIC_ERROR_DATA_LOST;
}
} }
nph_log.notice("basic_event: event:%d, from:%s(%s), size:%d", *event, static_cast<char*>(from->userId.handle.data), static_cast<char*>(from->name.data), *size); nph_log.notice("basic_event: event:%d, from:%s(%s), size:%d", *event, static_cast<char*>(from->userId.handle.data), static_cast<char*>(from->name.data), *size);