From 5e44da30101769a177c9cab654336a31c93df09b Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Thu, 3 Jun 2021 22:07:44 +0200 Subject: [PATCH] Fix ef991b17: server was trying to free() a packet created with "new CommandPacket()" (#9334) --- src/network/network.cpp | 2 +- src/network/network_server.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/network.cpp b/src/network/network.cpp index d89789cf94..862169c1d8 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -1072,7 +1072,7 @@ void NetworkGameLoop() if (cp != nullptr) { NetworkSendCommand(cp->tile, cp->p1, cp->p2, cp->cmd & ~CMD_FLAGS_MASK, nullptr, cp->text, cp->company); DEBUG(desync, 0, "Injecting: %08x; %02x; %02x; %06x; %08x; %08x; %08x; \"%s\" (%s)", _date, _date_fract, (int)_current_company, cp->tile, cp->p1, cp->p2, cp->cmd, cp->text.c_str(), GetCommandName(cp->cmd)); - free(cp); + delete cp; cp = nullptr; } if (check_sync_state) { diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index 49b1c8faf1..5b1da8fa2a 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -1758,7 +1758,7 @@ static void NetworkHandleCommandQueue(NetworkClientSocket *cs) CommandPacket *cp; while ((cp = cs->outgoing_queue.Pop()) != nullptr) { cs->SendCommand(cp); - free(cp); + delete cp; } }