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>> 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);