aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Keresztes Schmidt <carbenium@outlook.com>2020-08-23 21:19:44 +0200
committerShauren <shauren.trinity@gmail.com>2022-02-04 00:27:12 +0100
commit0257cdc8caf5758083e118dc389bae8610172342 (patch)
treef7a8e7f7e01de268ebce0dff4039da0059ce8025 /src
parent1f34964df45520da16e5acc139a3ed179acd0569 (diff)
Core/ChatCommands: Do not try to consume integral types if the token is empty (PR #25320)
(cherry picked from commit 6079bc7f34250e65efa3dcbe5471382b217ebf24)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Chat/ChatCommands/ChatCommandArgs.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Chat/ChatCommands/ChatCommandArgs.h b/src/server/game/Chat/ChatCommands/ChatCommandArgs.h
index 8a723686196..271d4850f2a 100644
--- a/src/server/game/Chat/ChatCommands/ChatCommandArgs.h
+++ b/src/server/game/Chat/ChatCommands/ChatCommandArgs.h
@@ -55,6 +55,9 @@ struct ArgInfo<T, std::enable_if_t<std::is_integral_v<T>>>
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);