From bda3b1078ac357b805156a8802a0649f7021716e Mon Sep 17 00:00:00 2001
From: Loki <lokirautio@gmail.com>
Date: Mon, 9 Mar 2026 06:53:08 -0500
Subject: Port over RCE Patches from LCEMP (#1023)

* LCEMP RCE Fixes WIP

Based on https://github.com/LCEMP/LCEMP/commit/d017bfc30a68888bf5c79b23cf5c4f607cf828bf

* Update to LCEMP's ByteArrayIO version

Fixes compilation since ours was missing some revisions from LCEMP

* Add additional safety checks missed in first pass

* Remove duplicate recipe count check
---
 Minecraft.World/TexturePacket.cpp | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'Minecraft.World/TexturePacket.cpp')

diff --git a/Minecraft.World/TexturePacket.cpp b/Minecraft.World/TexturePacket.cpp
index eadcb3ed..94c195a0 100644
--- a/Minecraft.World/TexturePacket.cpp
+++ b/Minecraft.World/TexturePacket.cpp
@@ -37,17 +37,26 @@ void TexturePacket::handle(PacketListener *listener)
 void TexturePacket::read(DataInputStream *dis) //throws IOException
 {
 	textureName = dis->readUTF();
-	dwBytes = static_cast<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 
-- 
cgit v1.2.3