Fix incorrect string length check after cast

minetest · Mar 6, 2019 · 82c6363 · 82c6363
1 parent c735497
commit 82c6363
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/network/networkpacket.cpp b/src/network/networkpacket.cpp
@@ -110,11 +110,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);
@@ -124,11 +125,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);
@@ -160,11 +162,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