Merge branch 'smartcmd:main' into main

1 files changed, 20 insertions, 11 deletions

diff --git a/Minecraft.World/TexturePacket.cpp b/Minecraft.World/TexturePacket.cpp
index 77dfdc38..94c195a0 100644
--- a/Minecraft.World/TexturePacket.cpp
+++ b/Minecraft.World/TexturePacket.cpp
@@ -10,13 +10,13 @@ TexturePacket::TexturePacket()
 {
 	this->textureName = L"";
 	this->dwBytes = 0;
-	this->pbData = NULL;
+	this->pbData = nullptr;
 }
 
 TexturePacket::~TexturePacket() 
 {
 	// can't free this - it's used elsewhere
-// 	if(this->pbData!=NULL)
+// 	if(this->pbData!=nullptr)
 // 	{
 // 		delete [] this->pbData;
 // 	}
@@ -37,23 +37,32 @@ void TexturePacket::handle(PacketListener *listener)
 void TexturePacket::read(DataInputStream *dis) //throws IOException
 {
 	textureName = dis->readUTF();
-	dwBytes = (DWORD)dis->readShort();
+    short rawBytes = dis->readShort();
+    if (rawBytes <= 0)
+    {
+        dwBytes = 0;
+        return;
+    }
+    dwBytes = (DWORD)(unsigned short)rawBytes;
+    if (dwBytes > 65536)
+    {
+        dwBytes = 0;
+        return;
+    }
+	
+	this->pbData= new BYTE [dwBytes];
 
-	if(dwBytes>0)
+	for(DWORD i=0;i<dwBytes;i++)
 	{
-		this->pbData= new BYTE [dwBytes];
-
-		for(DWORD i=0;i<dwBytes;i++)
-		{
-			this->pbData[i] = dis->readByte();
-		}
+		this->pbData[i] = dis->readByte();
 	}
+	
 }
 
 void TexturePacket::write(DataOutputStream *dos) //throws IOException 
 {
 	dos->writeUTF(textureName);
-	dos->writeShort((short)dwBytes);
+	dos->writeShort(static_cast<short>(dwBytes));
 	for(DWORD i=0;i<dwBytes;i++)
 	{
 		dos->writeByte(this->pbData[i]);