SPIGOT-4074: Fix createBlockData succeeding on garbage

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-07-20 10:20:15 +10:00
parent 3b128c5dbf
commit 6826aaee8f
2 changed files with 11 additions and 1 deletions

View File

@@ -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);