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

Revert "[Memory Leak] Change raw pointer to unique_ptr to avoid potential leak in dbg stream (#4616)"

Browse Source 
This reverts commit 1f3ac2dc4fd62e3e0d0c9cec210843d7202be0cd.
This commit is contained in:
Akkadius 2025-01-27 16:34:05 -06:00
parent bdcded7d45
commit fe66c24352
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/net/daybreak_connection.cpp
View File

@ -500,9 +500,10 @@ void EQ::Net::DaybreakConnection::ProcessQueue()
break;
}
auto &packet = iter->second;
auto packet = iter->second;
stream->packet_queue.erase(iter);
ProcessDecodedPacket(*packet);
delete packet;
}
}
}
@ -512,8 +513,9 @@ void EQ::Net::DaybreakConnection::RemoveFromQueue(int stream, uint16_t seq)
auto s = &m_streams[stream];
auto iter = s->packet_queue.find(seq);
if (iter != s->packet_queue.end()) {
auto &packet = iter->second;
auto packet = iter->second;
s->packet_queue.erase(iter);
delete packet;
}
}
@ -525,7 +527,7 @@ void EQ::Net::DaybreakConnection::AddToQueue(int stream, uint16_t seq, const Pac
DynamicPacket *out = new DynamicPacket();
out->PutPacket(0, p);
s->packet_queue.emplace(std::make_pair(seq, std::unique_ptr<Packet>(out)));
s->packet_queue.emplace(std::make_pair(seq, out));
}
}

2
common/net/daybreak_connection.h
View File

@ -201,7 +201,7 @@ namespace EQ
uint16_t sequence_in;
uint16_t sequence_out;
std::map<uint16_t, std::unique_ptr<Packet>> packet_queue;
std::map<uint16_t, Packet*> packet_queue;
DynamicPacket fragment_packet;
uint32_t fragment_current_bytes;