Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 16:13:46 +01:00
Code Issues Packages Projects Releases Wiki 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 GitHub
parent c735497a65
commit 82c6363559
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

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