111 lines
3.6 KiB
Diff
111 lines
3.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Allink <arclicious@vivaldi.net>
|
|
Date: Fri, 2 Jun 2023 22:13:54 +0100
|
|
Subject: [PATCH] Add depth limit to SNBT
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/nbt/TagParser.java b/src/main/java/net/minecraft/nbt/TagParser.java
|
|
index ee012f1ef1ff7f2adf76d1690dbd5611af7deb4d..d79723047317c24c53fb85c423de8dd9f84891ac 100644
|
|
--- a/src/main/java/net/minecraft/nbt/TagParser.java
|
|
+++ b/src/main/java/net/minecraft/nbt/TagParser.java
|
|
@@ -179,9 +179,56 @@ public class TagParser {
|
|
}
|
|
|
|
this.expect('}');
|
|
- return compoundTag;
|
|
+ return exceedsDepthLimit(compoundTag) ? new CompoundTag() : compoundTag; // Scissors - Add depth limit to SNBT
|
|
}
|
|
|
|
+ // Scissors start - Add depth limit to SNBT
|
|
+ private boolean exceedsDepthLimit(Tag tag) {
|
|
+ return this.exceedsDepthLimit(0, tag);
|
|
+ }
|
|
+
|
|
+ private boolean exceedsDepthLimit(long depth, Tag tag)
|
|
+ {
|
|
+ if (depth > 256)
|
|
+ {
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ if (tag instanceof ListTag listTag)
|
|
+ {
|
|
+ for (Tag childTag : listTag)
|
|
+ {
|
|
+ boolean returnValue = this.exceedsDepthLimit(depth + 1, childTag);
|
|
+
|
|
+ if (returnValue)
|
|
+ {
|
|
+ return true;
|
|
+ }
|
|
+ }
|
|
+ } else if (tag instanceof CompoundTag compoundTag)
|
|
+ {
|
|
+ for (String key: compoundTag.getAllKeys())
|
|
+ {
|
|
+ Tag childTag = compoundTag.get(key);
|
|
+
|
|
+ if (childTag == null)
|
|
+ {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ boolean returnValue = this.exceedsDepthLimit(depth + 1, childTag);
|
|
+
|
|
+ if (returnValue)
|
|
+ {
|
|
+ return true;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return false;
|
|
+ }
|
|
+ // Scissors end
|
|
+
|
|
private Tag readListTag() throws CommandSyntaxException {
|
|
this.expect('[');
|
|
this.reader.skipWhitespace();
|
|
@@ -213,7 +260,7 @@ public class TagParser {
|
|
}
|
|
|
|
this.expect(']');
|
|
- return listTag;
|
|
+ return exceedsDepthLimit(listTag) ? new ListTag() : listTag; // Scissors - Add depth limit to SNBT
|
|
}
|
|
}
|
|
|
|
@@ -238,7 +285,7 @@ public class TagParser {
|
|
}
|
|
|
|
private <T extends Number> List<T> readArray(TagType<?> arrayTypeReader, TagType<?> typeReader) throws CommandSyntaxException {
|
|
- List<T> list = Lists.newArrayList();
|
|
+ List<Number> list = Lists.newArrayList(); // Scissors - List<T> -> List<Number>
|
|
|
|
while(true) {
|
|
if (this.reader.peek() != ']') {
|
|
@@ -251,11 +298,11 @@ public class TagParser {
|
|
}
|
|
|
|
if (typeReader == ByteTag.TYPE) {
|
|
- list.add((T)((NumericTag)tag).getAsByte());
|
|
+ list.add(((NumericTag)tag).getAsByte()); // Scissors - Remove (T) cast
|
|
} else if (typeReader == LongTag.TYPE) {
|
|
- list.add((T)((NumericTag)tag).getAsLong());
|
|
+ list.add(((NumericTag)tag).getAsLong()); // Scissors - Remove (T) cast
|
|
} else {
|
|
- list.add((T)((NumericTag)tag).getAsInt());
|
|
+ list.add(((NumericTag)tag).getAsInt()); // Scissors - Remove (T) cast
|
|
}
|
|
|
|
if (this.hasElementSeparator()) {
|
|
@@ -267,7 +314,7 @@ public class TagParser {
|
|
}
|
|
|
|
this.expect(']');
|
|
- return list;
|
|
+ return (List<T>) list; // Scissors - Cast to List<T>
|
|
}
|
|
}
|
|
|