From 6079bc7f34250e65efa3dcbe5471382b217ebf24 Mon Sep 17 00:00:00 2001
From: Peter Keresztes Schmidt <carbenium@outlook.com>
Date: Sun, 23 Aug 2020 21:19:44 +0200
Subject: Core/ChatCommands: Do not try to consume integral types if the token
 is empty (PR #25320)

---
 src/server/game/Chat/ChatCommands/ChatCommandArgs.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/server')

diff --git a/src/server/game/Chat/ChatCommands/ChatCommandArgs.h b/src/server/game/Chat/ChatCommands/ChatCommandArgs.h
index bcfc336f7b3..ca94835272f 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);
-- 
cgit v1.2.3