mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Honk if you knew memset(nullptr, 0, 0) was UB

Browse Source
This commit is contained in:
RipleyTom 2024-01-09 16:27:19 +01:00 committed by Megamouse
parent 236e32fb3d
commit 61e130e68c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rpcs3/Emu/NP/np_cache.cpp
View File

@ -9,12 +9,13 @@ LOG_CHANNEL(np_cache);
namespace np namespace np
{ {
memberbin_cache::memberbin_cache(SceNpMatching2RoomMemberBinAttrInternal* sce_memberbin) memberbin_cache::memberbin_cache(const SceNpMatching2RoomMemberBinAttrInternal* sce_memberbin)
{ {
id = sce_memberbin->data.id; ensure(sce_memberbin && (sce_memberbin->data.ptr.get_ptr() || !sce_memberbin->data.size));
id = sce_memberbin->data.id;
updateDate.tick = sce_memberbin->updateDate.tick; updateDate.tick = sce_memberbin->updateDate.tick;
data.resize(sce_memberbin->data.size); data = std::vector<u8>(sce_memberbin->data.ptr.get_ptr(), sce_memberbin->data.ptr.get_ptr() + sce_memberbin->data.size);
memcpy(data.data(), sce_memberbin->data.ptr.get_ptr(), sce_memberbin->data.size);
} }
member_cache::member_cache(const SceNpMatching2RoomMemberDataInternal* sce_member) member_cache::member_cache(const SceNpMatching2RoomMemberDataInternal* sce_member)

2
rpcs3/Emu/NP/np_cache.h
View File

@ -19,7 +19,7 @@ namespace np
struct memberbin_cache struct memberbin_cache
{ {
memberbin_cache(SceNpMatching2RoomMemberBinAttrInternal* sce_memberbin); memberbin_cache(const SceNpMatching2RoomMemberBinAttrInternal* sce_memberbin);
SceNpMatching2AttributeId id; SceNpMatching2AttributeId id;
CellRtcTick updateDate; CellRtcTick updateDate;