aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/ComplexItemDataPacket.cpp
diff options
context:
space:
mode:
authorLoki <lokirautio@gmail.com>2026-03-09 06:53:08 -0500
committerGitHub <noreply@github.com>2026-03-09 06:53:08 -0500
commitbda3b1078ac357b805156a8802a0649f7021716e (patch)
tree838cf12ae598a810fb90a6e455f7fc03131f1342 /Minecraft.World/ComplexItemDataPacket.cpp
parenta358a3caaee2a4781f910cfb440bd822ae73a7e5 (diff)
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
Diffstat (limited to 'Minecraft.World/ComplexItemDataPacket.cpp')
-rw-r--r--Minecraft.World/ComplexItemDataPacket.cpp7
1 files changed, 6 insertions, 1 deletions
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);
}