minenux/minetest-engine-minetest
minenux/minetest-engine-minetest
1
0
Fork 0
Code Pull Requests Releases Activity

Fix incorrect string length check after cast

Browse Source
This commit is contained in:
rubenwardy 2019-03-06 22:24:39 +00:00 committed by luk3yx
parent 6b505ab61a
commit 0d8cdab46f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/network/networkpacket.cpp
View File

@ -109,11 +109,12 @@ NetworkPacket& NetworkPacket::operator>>(std::string& dst)
NetworkPacket& NetworkPacket::operator<<(const std::string &src)
{
u16 msgsize = src.size();
if (msgsize > STRING_MAX_LEN) {
if (src.size() > STRING_MAX_LEN) {
throw PacketError("String too long");
}
u16 msgsize = src.size();
*this << msgsize;
putRawString(src.c_str(), (u32)msgsize);
@ -123,11 +124,12 @@ NetworkPacket& NetworkPacket::operator<<(const std::string &src)
void NetworkPacket::putLongString(const std::string &src)
{
u32 msgsize = src.size();
if (msgsize > LONG_STRING_MAX_LEN) {
if (src.size() > LONG_STRING_MAX_LEN) {
throw PacketError("String too long");
}
u32 msgsize = src.size();
*this << msgsize;
putRawString(src.c_str(), msgsize);
@ -159,11 +161,12 @@ NetworkPacket& NetworkPacket::operator>>(std::wstring& dst)
NetworkPacket& NetworkPacket::operator<<(const std::wstring &src)
{
u16 msgsize = src.size();
if (msgsize > WIDE_STRING_MAX_LEN) {
if (src.size() > WIDE_STRING_MAX_LEN) {
throw PacketError("String too long");
}
u16 msgsize = src.size();
*this << msgsize;
// Write string