Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/PacketIO: Add a validating string helper class for use in packet classes

Browse Source 
(cherry picked from commit f2f47f774f)
This commit is contained in:
Shauren
2020-03-18 23:20:11 +01:00
parent def97385cc
commit 3ebfa8cc64
6 changed files with 192 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/shared/Packets/ByteBuffer.cpp
View File

@@ -39,16 +39,16 @@ ByteBufferPositionException::ByteBufferPositionException(size_t pos, size_t size
message().assign(ss.str());
}
ByteBufferInvalidValueException::ByteBufferInvalidValueException(char const* type, size_t pos)
ByteBufferInvalidValueException::ByteBufferInvalidValueException(char const* type, char const* value)
{
message().assign(Trinity::StringFormat("Invalid %s value found in ByteBuffer at pos " SZFMTD, type, pos));
message().assign(Trinity::StringFormat("Invalid %s value (%s) found in ByteBuffer", type, value));
}
ByteBuffer& ByteBuffer::operator>>(float& value)
{
value = read<float>();
if (!std::isfinite(value))
throw ByteBufferInvalidValueException("float", _rpos - sizeof(float));
throw ByteBufferInvalidValueException("float", "infinity");
return *this;
}
@@ -56,7 +56,7 @@ ByteBuffer& ByteBuffer::operator>>(double& value)
{
value = read<double>();
if (!std::isfinite(value))
throw ByteBufferInvalidValueException("double", _rpos - sizeof(double));
throw ByteBufferInvalidValueException("double", "infinity");
return *this;
}
@@ -71,7 +71,7 @@ std::string ByteBuffer::ReadCString(bool requireValidUtf8 /*= true*/)
value += c;
}
if (requireValidUtf8 && !utf8::is_valid(value.begin(), value.end()))
throw ByteBufferInvalidValueException("string", _rpos - value.length() - 1);
throw ByteBufferInvalidValueException("string", value.c_str());
return value;
}
@@ -87,7 +87,7 @@ std::string ByteBuffer::ReadString(uint32 length, bool requireValidUtf8 /*= true
std::string value(reinterpret_cast<char const*>(&_storage[_rpos]), length);
_rpos += length;
if (requireValidUtf8 && !utf8::is_valid(value.begin(), value.end()))
throw ByteBufferInvalidValueException("string", _rpos - value.length() - 1);
throw ByteBufferInvalidValueException("string", value.c_str());
return value;
}