pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-23 08:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix strcpy-param-overlap with GetGroupLeadershipInfo calls

Browse Source 
==1810==ERROR: AddressSanitizer: strcpy-param-overlap: memory ranges [0x7ffef04baf90,0x7ffef04baf98) and [0x7ffef04baf90, 0x7ffef04baf98) overlap
    #0 0x7f163bb9509e  (/lib/x86_64-linux-gnu/libasan.so.5+0x4f09e)
    #1 0x5652caed27b3 in Client::Handle_Connect_OP_ZoneEntry(EQApplicationPacket const*) ../zone/client_packet.cpp:1535

==1918==ERROR: AddressSanitizer: strcpy-param-overlap: memory ranges [0x7ffddc8057c0,0x7ffddc8057c8) and [0x7ffddc8057c0, 0x7ffddc8057c8) overlap
    #0 0x7fc61ee0e09e  (/lib/x86_64-linux-gnu/libasan.so.5+0x4f09e)
    #1 0x56023c149698 in WorldServer::HandleMessage(unsigned short, EQ::Net::Packet const&) ../zone/worldserver.cpp:1055
This commit is contained in:
Michael Cook (mackal) 2021-02-28 21:42:51 -05:00
parent 66f89416d5
commit c45395be95
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/database_instances.cpp
View File

@ -507,7 +507,7 @@ void Database::FlagInstanceByGroupLeader(uint32 zone, int16 version, uint32 char
char ln[128]; char ln[128];
memset(ln, 0, 128); memset(ln, 0, 128);
strcpy(ln, GetGroupLeadershipInfo(gid, ln)); GetGroupLeadershipInfo(gid, ln);
uint32 l_charid = GetCharacterID((const char*)ln); uint32 l_charid = GetCharacterID((const char*)ln);
uint16 l_id = GetInstanceID(zone, l_charid, version); uint16 l_id = GetInstanceID(zone, l_charid, version);

2
zone/client_packet.cpp
View File

@ -1532,7 +1532,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
int mentor_percent; int mentor_percent;
GroupLeadershipAA_Struct GLAA; GroupLeadershipAA_Struct GLAA;
memset(ln, 0, 64); memset(ln, 0, 64);
strcpy(ln, database.GetGroupLeadershipInfo(group->GetID(), ln, MainTankName, AssistName, PullerName, NPCMarkerName, mentoree_name, &mentor_percent, &GLAA)); database.GetGroupLeadershipInfo(group->GetID(), ln, MainTankName, AssistName, PullerName, NPCMarkerName, mentoree_name, &mentor_percent, &GLAA);
Client *c = entity_list.GetClientByName(ln); Client *c = entity_list.GetClientByName(ln);
if (c) if (c)
group->SetLeader(c); group->SetLeader(c);

2
zone/worldserver.cpp
View File

@ -1052,7 +1052,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
int mentor_percent; int mentor_percent;
GroupLeadershipAA_Struct GLAA; GroupLeadershipAA_Struct GLAA;
memset(ln, 0, 64); memset(ln, 0, 64);
strcpy(ln, database.GetGroupLeadershipInfo(group->GetID(), ln, MainTankName, AssistName, PullerName, NPCMarkerName, mentoree_name, &mentor_percent, &GLAA)); database.GetGroupLeadershipInfo(group->GetID(), ln, MainTankName, AssistName, PullerName, NPCMarkerName, mentoree_name, &mentor_percent, &GLAA);
Client *lc = entity_list.GetClientByName(ln); Client *lc = entity_list.GetClientByName(ln);
if (lc) if (lc)
group->SetLeader(lc); group->SetLeader(lc);