pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-02-28 20:42:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjust to safe_delete packets.

Browse Source
This commit is contained in:
JJ 2015-04-07 19:57:36 -04:00
parent 0321bf72a5
commit 0d4775a9df
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
world/zoneserver.cpp
View File

@ -190,7 +190,7 @@ bool ZoneServer::Process() {
Log.Out(Logs::Detail, Logs::World_Server,"Zone authorization failed."); Log.Out(Logs::Detail, Logs::World_Server,"Zone authorization failed.");
auto pack = new ServerPacket(ServerOP_ZAAuthFailed); auto pack = new ServerPacket(ServerOP_ZAAuthFailed);
SendPacket(pack); SendPacket(pack);
delete pack; safe_delete(pack);
Disconnect(); Disconnect();
return false; return false;
} }
@ -201,7 +201,7 @@ bool ZoneServer::Process() {
Log.Out(Logs::Detail, Logs::World_Server,"Zone authorization failed."); Log.Out(Logs::Detail, Logs::World_Server,"Zone authorization failed.");
auto pack = new ServerPacket(ServerOP_ZAAuthFailed); auto pack = new ServerPacket(ServerOP_ZAAuthFailed);
SendPacket(pack); SendPacket(pack);
delete pack; safe_delete(pack);
Disconnect(); Disconnect();
return false; return false;
} }
@ -779,7 +779,7 @@ bool ZoneServer::Process() {
whom->wrace = whoall->wrace; whom->wrace = whoall->wrace;
strcpy(whom->whom,whoall->whom); strcpy(whom->whom,whoall->whom);
client_list.SendWhoAll(whoall->fromid,whoall->from, whoall->admin, whom, this); client_list.SendWhoAll(whoall->fromid,whoall->from, whoall->admin, whom, this);
delete whom; safe_delete(whom);
break; break;
} }
case ServerOP_RequestOnlineGuildMembers: { case ServerOP_RequestOnlineGuildMembers: {
@ -958,7 +958,7 @@ bool ZoneServer::Process() {
tod->start_eqtime=zoneserver_list.worldclock.getStartEQTime(); tod->start_eqtime=zoneserver_list.worldclock.getStartEQTime();
tod->start_realtime=zoneserver_list.worldclock.getStartRealTime(); tod->start_realtime=zoneserver_list.worldclock.getStartRealTime();
SendPacket(pack); SendPacket(pack);
delete pack; safe_delete(pack);
break; break;
} }
case ServerOP_SetWorldTime: { case ServerOP_SetWorldTime: {
@ -1059,8 +1059,7 @@ bool ZoneServer::Process() {
} }
else else
{ {
delete pack; auto pack = new ServerPacket(ServerOP_Consent_Response, sizeof(ServerOP_Consent_Struct));
pack = new ServerPacket(ServerOP_Consent_Response, sizeof(ServerOP_Consent_Struct));
ServerOP_Consent_Struct* scs = (ServerOP_Consent_Struct*)pack->pBuffer; ServerOP_Consent_Struct* scs = (ServerOP_Consent_Struct*)pack->pBuffer;
strcpy(scs->grantname, s->grantname); strcpy(scs->grantname, s->grantname);
strcpy(scs->ownername, s->ownername); strcpy(scs->ownername, s->ownername);
@ -1076,6 +1075,7 @@ bool ZoneServer::Process() {
else { else {
Log.Out(Logs::Detail, Logs::World_Server, "Unable to locate zone record for instance id %u in zoneserver list for ServerOP_Consent_Response operation.", s->instance_id); Log.Out(Logs::Detail, Logs::World_Server, "Unable to locate zone record for instance id %u in zoneserver list for ServerOP_Consent_Response operation.", s->instance_id);
} }
safe_delete(pack);
} }
} }
else else
@ -1091,8 +1091,7 @@ bool ZoneServer::Process() {
} }
else { else {
// send target not found back to requester // send target not found back to requester
delete pack; auto pack = new ServerPacket(ServerOP_Consent_Response, sizeof(ServerOP_Consent_Struct));
pack = new ServerPacket(ServerOP_Consent_Response, sizeof(ServerOP_Consent_Struct));
ServerOP_Consent_Struct* scs = (ServerOP_Consent_Struct*)pack->pBuffer; ServerOP_Consent_Struct* scs = (ServerOP_Consent_Struct*)pack->pBuffer;
strcpy(scs->grantname, s->grantname); strcpy(scs->grantname, s->grantname);
strcpy(scs->ownername, s->ownername); strcpy(scs->ownername, s->ownername);
@ -1107,13 +1106,13 @@ bool ZoneServer::Process() {
else { else {
Log.Out(Logs::Detail, Logs::World_Server, "Unable to locate zone record for zone id %u in zoneserver list for ServerOP_Consent_Response operation.", s->zone_id); Log.Out(Logs::Detail, Logs::World_Server, "Unable to locate zone record for zone id %u in zoneserver list for ServerOP_Consent_Response operation.", s->zone_id);
} }
safe_delete(pack);
} }
} }
} }
else { else {
// send target not found back to requester // send target not found back to requester
delete pack; auto pack = new ServerPacket(ServerOP_Consent_Response, sizeof(ServerOP_Consent_Struct));
pack = new ServerPacket(ServerOP_Consent_Response, sizeof(ServerOP_Consent_Struct));
ServerOP_Consent_Struct* scs = (ServerOP_Consent_Struct*)pack->pBuffer; ServerOP_Consent_Struct* scs = (ServerOP_Consent_Struct*)pack->pBuffer;
strcpy(scs->grantname, s->grantname); strcpy(scs->grantname, s->grantname);
strcpy(scs->ownername, s->ownername); strcpy(scs->ownername, s->ownername);
@ -1128,6 +1127,7 @@ bool ZoneServer::Process() {
else { else {
Log.Out(Logs::Detail, Logs::World_Server, "Unable to locate zone record for zone id %u in zoneserver list for ServerOP_Consent_Response operation.", s->zone_id); Log.Out(Logs::Detail, Logs::World_Server, "Unable to locate zone record for zone id %u in zoneserver list for ServerOP_Consent_Response operation.", s->zone_id);
} }
safe_delete(pack);
} }
break; break;
} }
@ -1313,15 +1313,17 @@ bool ZoneServer::Process() {
} }
default: default:
{ {
Log.Out(Logs::Detail, Logs::World_Server,"Unknown ServerOPcode from zone 0x%04x, size %d",pack->opcode,pack->size); Log.Out(Logs::Detail, Logs::World_Server, "Unknown ServerOPcode from zone 0x%04x, size %d", pack->opcode, pack->size);
DumpPacket(pack->pBuffer, pack->size); DumpPacket(pack->pBuffer, pack->size);
break; break;
} }
} }
if (pack) if (pack) {
delete pack; safe_delete(pack);
else }
Log.Out(Logs::Detail, Logs::World_Server, "Zoneserver process tried to delete pack when pack does not exist."); else {
Log.Out(Logs::Detail, Logs::World_Server, "Zoneserver process attempted to delete pack when pack does not exist.");
}
} }
return true; return true;
} }