From 0257cdc8caf5758083e118dc389bae8610172342 Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Sun, 23 Aug 2020 21:19:44 +0200 Subject: [PATCH] Core/ChatCommands: Do not try to consume integral types if the token is empty (PR #25320) (cherry picked from commit 6079bc7f34250e65efa3dcbe5471382b217ebf24) --- src/server/game/Chat/ChatCommands/ChatCommandArgs.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/server/game/Chat/ChatCommands/ChatCommandArgs.h b/src/server/game/Chat/ChatCommands/ChatCommandArgs.h index 8a72368619..271d4850f2 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommandArgs.h +++ b/src/server/game/Chat/ChatCommands/ChatCommandArgs.h @@ -55,6 +55,9 @@ struct ArgInfo>> char const* next = args; std::string_view token(args, Trinity::Impl::ChatCommands::tokenize(next)); + if (!token.length()) + return nullptr; + std::from_chars_result result; if (StringStartsWith(token, "0x")) result = std::from_chars(token.data() + 2, token.data() + token.length(), val, 16);