dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-12-16 04:09:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clans: code styling & safety fix-ups

Browse Source
This commit is contained in:
zeph 2025-12-08 02:59:05 +01:00
parent dccaf789a1
commit 966fa1cab3
4 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rpcs3/Emu/Cell/Modules/sceNpClans.cpp
View File

@ -1063,9 +1063,6 @@ error_code sceNpClansPostChallenge(vm::ptr<SceNpClansRequestHandle> handle, SceN
return SCE_NP_CLANS_ERROR_EXCEEDS_MAX; return SCE_NP_CLANS_ERROR_EXCEEDS_MAX;
} }
vm::var<struct SceNpClansRequest> req;
vm::write32(handle.addr(), req.addr());
return CELL_OK; return CELL_OK;
} }

2
rpcs3/Emu/Cell/Modules/sceNpClans.h
View File

@ -282,4 +282,4 @@ struct SceNpClansBlacklistEntry
{ {
SceNpId entry; SceNpId entry;
SceNpId registeredBy; SceNpId registeredBy;
}; };

34
rpcs3/Emu/NP/clans_client.cpp
View File

@ -1,3 +1,4 @@
#include "Utilities/StrUtil.h"
#include "stdafx.h" #include "stdafx.h"
#include "util/types.hpp" #include "util/types.hpp"
@ -348,8 +349,8 @@ namespace clan
.role = static_cast<SceNpClansMemberRole>(role_int), .role = static_cast<SceNpClansMemberRole>(role_int),
.status = static_cast<SceNpClansMemberStatus>(status_int)}; .status = static_cast<SceNpClansMemberStatus>(status_int)};
snprintf(entry.info.name, sizeof(entry.info.name), "%s", name_str.c_str()); strcpy_trunc(entry.info.name, name_str.c_str());
snprintf(entry.info.tag, sizeof(entry.info.tag), "%s", tag_str.c_str()); strcpy_trunc(entry.info.tag, tag_str.c_str());
clanList[i] = entry; clanList[i] = entry;
i++; i++;
@ -394,9 +395,9 @@ namespace clan
.description = "", .description = "",
}}; }};
snprintf(clanInfo->info.name, sizeof(clanInfo->info.name), "%s", name_str.c_str()); strcpy_trunc(clanInfo->info.name, name_str.c_str());
snprintf(clanInfo->info.tag, sizeof(clanInfo->info.tag), "%s", tag_str.c_str()); strcpy_trunc(clanInfo->info.tag, tag_str.c_str());
snprintf(clanInfo->updatable.description, sizeof(clanInfo->updatable.description), "%s", description_str.c_str()); strcpy_trunc(clanInfo->updatable.description, description_str.c_str());
return SCE_NP_CLANS_SUCCESS; return SCE_NP_CLANS_SUCCESS;
} }
@ -451,7 +452,7 @@ namespace clan
std::string description_str = description.text().as_string(); std::string description_str = description.text().as_string();
char description_char[256] = {0}; char description_char[256] = {0};
snprintf(description_char, sizeof(description_char), "%s", description_str.c_str()); strcpy_trunc(description_char, description_str.c_str());
*memInfo = SceNpClansMemberEntry *memInfo = SceNpClansMemberEntry
{ {
@ -463,8 +464,8 @@ namespace clan
} }
}; };
snprintf(memInfo->npid.handle.data, sizeof(memInfo->npid.handle.data), "%s", username); strcpy_trunc(memInfo->npid.handle.data, username);
snprintf(memInfo->updatable.description, sizeof(memInfo->updatable.description), "%s", description_char); strcpy_trunc(memInfo->updatable.description, description_char);
return SCE_NP_CLANS_SUCCESS; return SCE_NP_CLANS_SUCCESS;
} }
@ -521,7 +522,7 @@ namespace clan
std::string description_str = info.child("description").text().as_string(); std::string description_str = info.child("description").text().as_string();
char description_char[256] = {0}; char description_char[256] = {0};
snprintf(description_char, sizeof(description_char), "%s", description_str.c_str()); strcpy_trunc(description_char, description_str.c_str());
SceNpClansMemberEntry entry = SceNpClansMemberEntry SceNpClansMemberEntry entry = SceNpClansMemberEntry
{ {
@ -530,7 +531,7 @@ namespace clan
.status = static_cast<SceNpClansMemberStatus>(status_int), .status = static_cast<SceNpClansMemberStatus>(status_int),
}; };
snprintf(entry.updatable.description, sizeof(entry.updatable.description), "%s", description_char); strcpy_trunc(entry.updatable.description, description_char);
memList[i] = entry; memList[i] = entry;
i++; i++;
@ -589,7 +590,7 @@ namespace clan
} }
}; };
snprintf(npid.handle.data, sizeof(npid.handle.data), "%s", username); strcpy_trunc(npid.handle.data, username);
SceNpClansBlacklistEntry entry = SceNpClansBlacklistEntry SceNpClansBlacklistEntry entry = SceNpClansBlacklistEntry
{ {
@ -687,8 +688,8 @@ namespace clan
.reserved = {0, 0}, .reserved = {0, 0},
}; };
snprintf(entry.name, sizeof(entry.name), "%s", name_str.c_str()); strcpy_trunc(entry.name, name_str.c_str());
snprintf(entry.tag, sizeof(entry.tag), "%s", tag_str.c_str()); strcpy_trunc(entry.tag, tag_str.c_str());
clanList[i] = entry; clanList[i] = entry;
i++; i++;
@ -971,9 +972,8 @@ namespace clan
.postedBy = clanId, .postedBy = clanId,
}; };
strcpy_trunc(entry.message.subject, subject_str.c_str());
snprintf(entry.message.subject, sizeof(entry.message.subject), "%s", subject_str.c_str()); strcpy_trunc(entry.message.body, msg_str.c_str());
snprintf(entry.message.body, sizeof(entry.message.body), "%s", msg_str.c_str());
announcements[i] = entry; announcements[i] = entry;
i++; i++;
@ -1033,4 +1033,4 @@ namespace clan
return sendRequest(ClanRequestAction::DeleteAnnouncement, ClanManagerOperationType::UPDATE, &doc, &response); return sendRequest(ClanRequestAction::DeleteAnnouncement, ClanManagerOperationType::UPDATE, &doc, &response);
} }
} }
#pragma endregion #pragma endregion

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

@ -117,4 +117,4 @@ struct sce_np_clans_manager
{ {
atomic_t<bool> is_initialized = false; atomic_t<bool> is_initialized = false;
clan::clans_client* client; clan::clans_client* client;
}; };