pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-03 19:52:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reverting last push due to zone crash from double deletes.

Browse Source
This commit is contained in:
Trevius 2015-01-23 17:13:21 -06:00
parent bfca9c0383
commit c822990213
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/patches/rof2.cpp
View File

@ -620,8 +620,8 @@ namespace RoF2
Log.Out(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", Log.Out(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d",
opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(InternalSerializedItem_Struct)); opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(InternalSerializedItem_Struct));
delete[] __emu_buffer;
delete in; delete in;
return; return;
} }
@ -1216,7 +1216,6 @@ namespace RoF2
memcpy(&GLAAus->LeaderAAs, &gu2->leader_aas, sizeof(GLAAus->LeaderAAs)); memcpy(&GLAAus->LeaderAAs, &gu2->leader_aas, sizeof(GLAAus->LeaderAAs));
dest->FastQueuePacket(&outapp); dest->FastQueuePacket(&outapp);
delete[] __emu_buffer;
delete in; delete in;
return; return;
@ -1239,7 +1238,6 @@ namespace RoF2
FINISH_ENCODE(); FINISH_ENCODE();
dest->FastQueuePacket(&outapp); dest->FastQueuePacket(&outapp);
delete in;
} }
ENCODE(OP_GuildMemberList) ENCODE(OP_GuildMemberList)
@ -1532,7 +1530,6 @@ namespace RoF2
if (!serialized) { if (!serialized) {
Log.Out(Logs::General, Logs::Netcode, "[STRUCTS] Serialization failed on item slot %d.", int_struct->slot_id); Log.Out(Logs::General, Logs::Netcode, "[STRUCTS] Serialization failed on item slot %d.", int_struct->slot_id);
delete[] __emu_buffer;
delete in; delete in;
return; return;
} }
@ -1689,7 +1686,6 @@ namespace RoF2
} }
dest->FastQueuePacket(&outapp, ack_req); dest->FastQueuePacket(&outapp, ack_req);
delete[] __emu_buffer;
delete in; delete in;
} }
@ -1769,7 +1765,6 @@ namespace RoF2
} }
dest->FastQueuePacket(&outapp, ack_req); dest->FastQueuePacket(&outapp, ack_req);
delete[] __emu_buffer;
delete in; delete in;
} }
@ -2736,8 +2731,6 @@ namespace RoF2
//Log.Hex(Logs::Netcode, outapp->pBuffer, outapp->size); //Log.Hex(Logs::Netcode, outapp->pBuffer, outapp->size);
dest->FastQueuePacket(&outapp, ack_req); dest->FastQueuePacket(&outapp, ack_req);
delete[] NewBuffer;
delete[] __emu_buffer;
delete in; delete in;
return; return;
} }
@ -2757,7 +2750,6 @@ namespace RoF2
strn0cpy(general->player_name, raid_create->leader_name, 64); strn0cpy(general->player_name, raid_create->leader_name, 64);
dest->FastQueuePacket(&outapp_create); dest->FastQueuePacket(&outapp_create);
delete[] __emu_buffer;
safe_delete(inapp); safe_delete(inapp);
} }
@ -2825,7 +2817,6 @@ namespace RoF2
dest->FastQueuePacket(&outapp); dest->FastQueuePacket(&outapp);
} }
delete[] __emu_buffer;
safe_delete(inapp); safe_delete(inapp);
} }
@ -3210,7 +3201,6 @@ namespace RoF2
if (sas->type != AT_Size) if (sas->type != AT_Size)
{ {
dest->FastQueuePacket(&in, ack_req); dest->FastQueuePacket(&in, ack_req);
delete[] emu_buffer;
return; return;
} }
@ -3224,7 +3214,6 @@ namespace RoF2
css->Unknown12 = 1.0f; css->Unknown12 = 1.0f;
dest->FastQueuePacket(&outapp, ack_req); dest->FastQueuePacket(&outapp, ack_req);
delete[] emu_buffer;
delete in; delete in;
} }
@ -3530,7 +3519,6 @@ namespace RoF2
if (EntryCount == 0 || ((in->size % sizeof(Track_Struct))) != 0) if (EntryCount == 0 || ((in->size % sizeof(Track_Struct))) != 0)
{ {
Log.Out(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Track_Struct)); Log.Out(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Track_Struct));
delete[] __emu_buffer;
delete in; delete in;
return; return;
} }
@ -3698,7 +3686,6 @@ namespace RoF2
} }
dest->FastQueuePacket(&outapp_create); dest->FastQueuePacket(&outapp_create);
delete[] __emu_buffer;
delete inapp; delete inapp;
} }
@ -3866,7 +3853,6 @@ namespace RoF2
int entrycount = in->size / sizeof(Spawn_Struct); int entrycount = in->size / sizeof(Spawn_Struct);
if (entrycount == 0 || (in->size % sizeof(Spawn_Struct)) != 0) { if (entrycount == 0 || (in->size % sizeof(Spawn_Struct)) != 0) {
Log.Out(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Spawn_Struct)); Log.Out(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Spawn_Struct));
delete[] __emu_buffer;
delete in; delete in;
return; return;
} }
@ -4124,7 +4110,7 @@ namespace RoF2
//Log.Hex(Logs::Netcode, outapp->pBuffer, outapp->size); //Log.Hex(Logs::Netcode, outapp->pBuffer, outapp->size);
dest->FastQueuePacket(&outapp, ack_req); dest->FastQueuePacket(&outapp, ack_req);
} }
delete[] __emu_buffer;
delete in; delete in;
} }