From 3f0ce98f7cf5e3ae4d2383dd106fee6eecb3dd2a Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 28 Apr 2019 18:56:45 +0200 Subject: Core/Commands: Fix heap-use-after-free in ".ticket delete" command Reported by Address Sanitizer --- src/server/scripts/Commands/cs_ticket.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Commands/cs_ticket.cpp b/src/server/scripts/Commands/cs_ticket.cpp index c5d6f7db1ce..52b3592257f 100644 --- a/src/server/scripts/Commands/cs_ticket.cpp +++ b/src/server/scripts/Commands/cs_ticket.cpp @@ -291,9 +291,6 @@ public: std::string msg = ticket->FormatMessageString(*handler, nullptr, nullptr, nullptr, handler->GetSession() ? handler->GetSession()->GetPlayer()->GetName().c_str() : "Console", nullptr); handler->SendGlobalGMSysMessage(msg.c_str()); - sTicketMgr->RemoveTicket(ticket->GetId()); - sTicketMgr->UpdateLastChange(); - if (Player* player = ticket->GetPlayer()) { // Force abandon ticket @@ -302,6 +299,9 @@ public: player->SendDirectMessage(&data); } + sTicketMgr->RemoveTicket(ticket->GetId()); + sTicketMgr->UpdateLastChange(); + return true; } -- cgit v1.2.3