aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2019-04-28 18:56:45 +0200
committerjackpoz <giacomopoz@gmail.com>2019-04-28 18:56:45 +0200
commit3f0ce98f7cf5e3ae4d2383dd106fee6eecb3dd2a (patch)
treedb62a887ebc7a355b8b84c72ff7bbd85d94046a9 /src
parentf45ebe71b0d8f6e3008514324a58a92c0db3810e (diff)
Core/Commands: Fix heap-use-after-free in ".ticket delete" command
Reported by Address Sanitizer
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Commands/cs_ticket.cpp6
1 files changed, 3 insertions, 3 deletions
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;
}