Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-27 12:22:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/PacketIO: Validate utf8 in every client packet

Browse Source
This commit is contained in:
Shauren
2020-03-15 14:28:29 +01:00
parent 8102fae3d5
commit 0a2a96efaa
4 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/server/shared/Packets/ByteBuffer.h
View File

@@ -30,12 +30,12 @@ class MessageBuffer;
class TC_SHARED_API ByteBufferException : public std::exception
{
public:
~ByteBufferException() throw() { }
~ByteBufferException() noexcept = default;
char const* what() const throw() override { return msg_.c_str(); }
char const* what() const noexcept override { return msg_.c_str(); }
protected:
std::string & message() throw() { return msg_; }
std::string & message() noexcept { return msg_; }
private:
std::string msg_;
@@ -46,7 +46,7 @@ class TC_SHARED_API ByteBufferPositionException : public ByteBufferException
public:
ByteBufferPositionException(bool add, size_t pos, size_t size, size_t valueSize);
~ByteBufferPositionException() throw() { }
~ByteBufferPositionException() noexcept = default;
};
class TC_SHARED_API ByteBufferSourceException : public ByteBufferException
@@ -54,13 +54,21 @@ class TC_SHARED_API ByteBufferSourceException : public ByteBufferException
public:
ByteBufferSourceException(size_t pos, size_t size, size_t valueSize);
~ByteBufferSourceException() throw() { }
~ByteBufferSourceException() noexcept = default;
};
class TC_SHARED_API ByteBufferInvalidValueException : public ByteBufferException
{
public:
ByteBufferInvalidValueException(char const* type, size_t pos);
~ByteBufferInvalidValueException() noexcept = default;
};
class TC_SHARED_API ByteBuffer
{
public:
const static size_t DEFAULT_SIZE = 0x1000;
constexpr static size_t DEFAULT_SIZE = 0x1000;
// constructor
ByteBuffer() : _rpos(0), _wpos(0)
@@ -73,13 +81,13 @@ class TC_SHARED_API ByteBuffer
_storage.reserve(reserve);
}
ByteBuffer(ByteBuffer&& buf) : _rpos(buf._rpos), _wpos(buf._wpos), _storage(std::move(buf._storage))
ByteBuffer(ByteBuffer&& buf) noexcept : _rpos(buf._rpos), _wpos(buf._wpos), _storage(std::move(buf._storage))
{
buf._rpos = 0;
buf._wpos = 0;
}
ByteBuffer(ByteBuffer const& right) : _rpos(right._rpos), _wpos(right._wpos), _storage(right._storage) { }
ByteBuffer(ByteBuffer const& right) = default;
ByteBuffer(MessageBuffer&& buffer);
@@ -95,7 +103,7 @@ class TC_SHARED_API ByteBuffer
return *this;
}
ByteBuffer& operator=(ByteBuffer&& right)
ByteBuffer& operator=(ByteBuffer&& right) noexcept
{
if (this != &right)
{
@@ -109,7 +117,7 @@ class TC_SHARED_API ByteBuffer
return *this;
}
virtual ~ByteBuffer() { }
virtual ~ByteBuffer() = default;
void clear()
{
@@ -268,16 +276,9 @@ class TC_SHARED_API ByteBuffer
ByteBuffer &operator>>(float &value);
ByteBuffer &operator>>(double &value);
ByteBuffer &operator>>(std::string& value)
ByteBuffer& operator>>(std::string& value)
{
value.clear();
while (rpos() < size()) // prevent crash at wrong string format in packet
{
char c = read<char>();
if (c == 0)
break;
value += c;
}
value = ReadCString(true);
return *this;
}
@@ -374,6 +375,8 @@ class TC_SHARED_API ByteBuffer
}
}
std::string ReadCString(bool requireValidUtf8 = true);
uint32 ReadPackedTime();
ByteBuffer& ReadPackedTime(uint32& time)