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/ComplexItemDataPacket.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/Minecraft.World/ComplexItemDataPacket.cpp b/Minecraft.World/ComplexItemDataPacket.cpp
index 38c39cb6..98eeb9de 100644
--- a/Minecraft.World/ComplexItemDataPacket.cpp
+++ b/Minecraft.World/ComplexItemDataPacket.cpp
@@ -32,7 +32,12 @@ void ComplexItemDataPacket::read(DataInputStream *dis) //throws IOException
 	itemType = dis->readShort();
 	itemId = dis->readShort();
 
-	data = charArray(dis->readUnsignedShort() & 0xffff);
+	int dataLength = dis->readShort() & 0xffff;
+    if (dataLength > 32767)
+    {
+        dataLength = 0;
+    }
+    data = charArray(dataLength);
 	dis->readFully(data);
 }
 
-- 
cgit v1.2.3