pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 10:31:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[CRASH] Fix crash on CentOS when forming a raid with PCs or BOTs (#3676)

Browse Source 
* [CRASH] Fix crash on CentOS

Update raid crash in CentOS.  raid constructors and learnmembers used a memset that was overwriting std::string structure.
Added default initializers to RaidMember struct

* Update based on feedback
This commit is contained in:
Mitch Freeman 2023-11-06 14:36:59 -04:00 committed by GitHub
parent d812310c5b
commit 0aadb891a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
zone/raids.cpp
View File

@ -40,7 +40,6 @@ extern WorldServer worldserver;
Raid::Raid(uint32 raidID)
: GroupIDConsumer(raidID)
{
memset(members ,0, (sizeof(RaidMember)*MAX_RAID_MEMBERS));
memset(&raid_aa, 0, sizeof(RaidLeadershipAA_Struct));
memset(group_aa, 0, sizeof(GroupLeadershipAA_Struct) * MAX_RAID_GROUPS);
for (auto& gm : group_mentor) {
@ -66,7 +65,6 @@ Raid::Raid(uint32 raidID)
Raid::Raid(Client* nLeader)
: GroupIDConsumer()
{
memset(members ,0, (sizeof(RaidMember)*MAX_RAID_MEMBERS));
memset(&raid_aa, 0, sizeof(RaidLeadershipAA_Struct));
memset(group_aa, 0, sizeof(GroupLeadershipAA_Struct) * MAX_RAID_GROUPS);
for (auto& gm : group_mentor) {
@ -1705,7 +1703,7 @@ void Raid::SaveRaidMOTD()
bool Raid::LearnMembers()
{
memset(members, 0, (sizeof(RaidMember) * MAX_RAID_MEMBERS));
EmptyRaidMembers();
auto raid_members = RaidMembersRepository::GetWhere(
database,
@ -2975,3 +2973,22 @@ void Raid::SendMarkTargets(Client* c)
}
UpdateXtargetMarkedNPC();
}
void Raid::EmptyRaidMembers()
{
for (int i = 0; i < MAX_RAID_MEMBERS; i++) {
members[i].group_number = RAID_GROUPLESS;
members[i].is_group_leader = 0;
members[i].level = 0;
members[i].main_assister = 0;
members[i].main_marker = 0;
members[i]._class = 0;
members[i].is_bot = false;
members[i].is_looter = false;
members[i].is_raid_leader = false;
members[i].is_raid_main_assist_one = false;
members[i].member = nullptr;
members[i].note.clear();
members[i].member_name[0] = '\0';
}
}

27
zone/raids.h
View File

@ -75,19 +75,19 @@ const uint32 RAID_GROUPLESS = 0xFFFFFFFF;
#define MAX_NO_RAID_MAIN_MARKERS 3
struct RaidMember{
char member_name[64];
Client *member;
uint32 group_number;
uint8 _class;
uint8 level;
std::string note;
bool is_group_leader;
bool is_raid_leader;
bool is_looter;
uint8 main_marker;
uint8 main_assister;
bool is_bot = false;
bool is_raid_main_assist_one = false;
char member_name[64]{ 0 };
Client* member{ nullptr };
uint32 group_number{ RAID_GROUPLESS };
uint8 _class{ 0 };
uint8 level{ 0 };
std::string note{};
bool is_group_leader{ false };
bool is_raid_leader{ false };
bool is_looter{ false };
uint8 main_marker{ 0 };
uint8 main_assister{ 0 };
bool is_bot{ false };
bool is_raid_main_assist_one{false};
};
struct GroupMentor {
@ -131,6 +131,7 @@ public:
void SetNewRaidLeader(uint32 i);
bool IsAssister(const char* who);
bool IsMarker(const char* who);
void EmptyRaidMembers();
uint32 GetFreeGroup();
uint8 GroupCount(uint32 gid);