SPIGOT-4074: Fix createBlockData succeeding on garbage

1 files changed, 4 insertions, 1 deletions

diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
index c2619a5f..4b2f7a05 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
@@ -403,7 +403,10 @@ public class CraftBlockData implements BlockData {
                     data = Block.REGISTRY.b(block) + data;
                 }
 
-                ArgumentBlock arg = new ArgumentBlock(new StringReader(data), false).a(false);
+                StringReader reader = new StringReader(data);
+                ArgumentBlock arg = new ArgumentBlock(reader, false).a(false);
+                Preconditions.checkArgument(!reader.canRead(), "Spurious trailing data");
+
                 blockData = arg.b();
             } catch (CommandSyntaxException ex) {
                 throw new IllegalArgumentException("Could not parse data: " + data, ex);