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

Fixed memory leak in OP_VeteranRewardsAvailable

Browse Source
This commit is contained in:
Derision 2013-03-19 19:22:16 +00:00
parent 09df77b56e
commit f32a277643
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/patches/RoF.cpp
View File

@ -3150,6 +3150,7 @@ ENCODE(OP_VetRewardsAvaliable)
unsigned char * __emu_buffer = inapp->pBuffer; unsigned char * __emu_buffer = inapp->pBuffer;
uint32 count = ((*p)->Size() / sizeof(InternalVeteranReward)); uint32 count = ((*p)->Size() / sizeof(InternalVeteranReward));
*p = NULL;
EQApplicationPacket *outapp_create = new EQApplicationPacket(OP_VetRewardsAvaliable, (sizeof(structs::VeteranReward)*count)); EQApplicationPacket *outapp_create = new EQApplicationPacket(OP_VetRewardsAvaliable, (sizeof(structs::VeteranReward)*count));
uchar *old_data = __emu_buffer; uchar *old_data = __emu_buffer;
@ -3174,7 +3175,7 @@ ENCODE(OP_VetRewardsAvaliable)
} }
dest->FastQueuePacket(&outapp_create); dest->FastQueuePacket(&outapp_create);
delete[] __emu_buffer; delete inapp;
} }
ENCODE(OP_WhoAllResponse) ENCODE(OP_WhoAllResponse)

3
common/patches/SoD.cpp
View File

@ -2097,6 +2097,7 @@ ENCODE(OP_VetRewardsAvaliable)
unsigned char * __emu_buffer = inapp->pBuffer; unsigned char * __emu_buffer = inapp->pBuffer;
uint32 count = ((*p)->Size() / sizeof(InternalVeteranReward)); uint32 count = ((*p)->Size() / sizeof(InternalVeteranReward));
*p = NULL;
EQApplicationPacket *outapp_create = new EQApplicationPacket(OP_VetRewardsAvaliable, (sizeof(structs::VeteranReward)*count)); EQApplicationPacket *outapp_create = new EQApplicationPacket(OP_VetRewardsAvaliable, (sizeof(structs::VeteranReward)*count));
uchar *old_data = __emu_buffer; uchar *old_data = __emu_buffer;
@ -2121,7 +2122,7 @@ ENCODE(OP_VetRewardsAvaliable)
} }
dest->FastQueuePacket(&outapp_create); dest->FastQueuePacket(&outapp_create);
delete[] __emu_buffer; delete inapp;
} }
ENCODE(OP_WhoAllResponse) ENCODE(OP_WhoAllResponse)

3
common/patches/SoF.cpp
View File

@ -1735,6 +1735,7 @@ ENCODE(OP_VetRewardsAvaliable)
unsigned char * __emu_buffer = inapp->pBuffer; unsigned char * __emu_buffer = inapp->pBuffer;
uint32 count = ((*p)->Size() / sizeof(InternalVeteranReward)); uint32 count = ((*p)->Size() / sizeof(InternalVeteranReward));
*p = NULL;
EQApplicationPacket *outapp_create = new EQApplicationPacket(OP_VetRewardsAvaliable, (sizeof(structs::VeteranReward)*count)); EQApplicationPacket *outapp_create = new EQApplicationPacket(OP_VetRewardsAvaliable, (sizeof(structs::VeteranReward)*count));
uchar *old_data = __emu_buffer; uchar *old_data = __emu_buffer;
@ -1759,7 +1760,7 @@ ENCODE(OP_VetRewardsAvaliable)
} }
dest->FastQueuePacket(&outapp_create); dest->FastQueuePacket(&outapp_create);
delete[] __emu_buffer; delete inapp;
} }
ENCODE(OP_DeleteSpawn) { ENCODE(OP_DeleteSpawn) {

3
common/patches/Titanium.cpp
View File

@ -898,6 +898,7 @@ ENCODE(OP_VetRewardsAvaliable)
unsigned char * __emu_buffer = inapp->pBuffer; unsigned char * __emu_buffer = inapp->pBuffer;
uint32 count = ((*p)->Size() / sizeof(InternalVeteranReward)); uint32 count = ((*p)->Size() / sizeof(InternalVeteranReward));
*p = NULL;
EQApplicationPacket *outapp_create = new EQApplicationPacket(OP_VetRewardsAvaliable, (sizeof(structs::VeteranReward)*count)); EQApplicationPacket *outapp_create = new EQApplicationPacket(OP_VetRewardsAvaliable, (sizeof(structs::VeteranReward)*count));
uchar *old_data = __emu_buffer; uchar *old_data = __emu_buffer;
@ -916,7 +917,7 @@ ENCODE(OP_VetRewardsAvaliable)
} }
dest->FastQueuePacket(&outapp_create); dest->FastQueuePacket(&outapp_create);
delete[] __emu_buffer; delete inapp;
} }
ENCODE(OP_InspectAnswer) { ENCODE(OP_InspectAnswer) {

3
common/patches/Underfoot.cpp
View File

@ -2157,6 +2157,7 @@ ENCODE(OP_VetRewardsAvaliable)
unsigned char * __emu_buffer = inapp->pBuffer; unsigned char * __emu_buffer = inapp->pBuffer;
uint32 count = ((*p)->Size() / sizeof(InternalVeteranReward)); uint32 count = ((*p)->Size() / sizeof(InternalVeteranReward));
*p = NULL;
EQApplicationPacket *outapp_create = new EQApplicationPacket(OP_VetRewardsAvaliable, (sizeof(structs::VeteranReward)*count)); EQApplicationPacket *outapp_create = new EQApplicationPacket(OP_VetRewardsAvaliable, (sizeof(structs::VeteranReward)*count));
uchar *old_data = __emu_buffer; uchar *old_data = __emu_buffer;
@ -2181,7 +2182,7 @@ ENCODE(OP_VetRewardsAvaliable)
} }
dest->FastQueuePacket(&outapp_create); dest->FastQueuePacket(&outapp_create);
delete[] __emu_buffer; delete inapp;
} }
ENCODE(OP_WhoAllResponse) ENCODE(OP_WhoAllResponse)

1
zone/zonedb.cpp
View File

@ -1885,7 +1885,6 @@ void ZoneDatabase::LoadMercBuffs(Merc *merc) {
} }
safe_delete_array(Query); safe_delete_array(Query);
Query = 0;
if(errorMessage.empty() && BuffsLoaded) { if(errorMessage.empty() && BuffsLoaded) {
if(!database.RunQuery(Query, MakeAnyLenString(&Query, "DELETE FROM merc_buffs WHERE MercId = %u", merc->GetMercID()), TempErrorMessageBuffer)) { if(!database.RunQuery(Query, MakeAnyLenString(&Query, "DELETE FROM merc_buffs WHERE MercId = %u", merc->GetMercID()), TempErrorMessageBuffer)) {