TeaSpeak/TeaSpeakLibrary
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved packet allocation

Browse Source
This commit is contained in:
WolverinDEV 2021-02-07 18:14:14 +01:00
parent 261a237291
commit 7c82007b4e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/protocol/Packet.cpp
View File

@ -160,7 +160,8 @@ namespace ts {
protocol::OutgoingServerPacket* protocol::allocate_outgoing_server_packet(size_t payload_size) { protocol::OutgoingServerPacket* protocol::allocate_outgoing_server_packet(size_t payload_size) {
auto base_size = sizeof(protocol::OutgoingServerPacket) - 1; auto base_size = sizeof(protocol::OutgoingServerPacket) - 1;
auto full_size = base_size + payload_size; /* Allocate at least one payload byte since we're our payload array of length 1 */
auto full_size = base_size + std::max(payload_size, (size_t) 1);
auto result = (protocol::OutgoingServerPacket*) malloc(full_size); auto result = (protocol::OutgoingServerPacket*) malloc(full_size);
construct_osp(result); construct_osp(result);
@ -178,7 +179,8 @@ namespace ts {
protocol::OutgoingClientPacket* protocol::allocate_outgoing_client_packet(size_t payload_size) { protocol::OutgoingClientPacket* protocol::allocate_outgoing_client_packet(size_t payload_size) {
auto base_size = sizeof(protocol::OutgoingClientPacket) - 1; auto base_size = sizeof(protocol::OutgoingClientPacket) - 1;
auto full_size = base_size + payload_size; /* Allocate at least one payload byte since we're our payload array of length 1 */
auto full_size = base_size + std::max(payload_size, (size_t) 1);
auto result = (protocol::OutgoingClientPacket*) malloc(full_size); auto result = (protocol::OutgoingClientPacket*) malloc(full_size);
construct_ocp(result); construct_ocp(result);

2
src/protocol/Packet.h
View File

@ -244,7 +244,7 @@ namespace ts::protocol {
struct OutgoingClientPacket : public OutgoingPacket { struct OutgoingClientPacket : public OutgoingPacket {
public: public:
OutgoingClientPacket() = default; OutgoingClientPacket() = default;
virtual ~OutgoingClientPacket() = default; ~OutgoingClientPacket() override = default;
OutgoingClientPacket* next; /* used within the write/process queue */ OutgoingClientPacket* next; /* used within the write/process queue */