From 6439f28c0c68a120cfb091ae6e6e1c415c685ca1 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Thu, 2 Feb 2017 10:29:37 +1100 Subject: [PATCH] Add restrictions to region copy --- .../object/clipboard/DiskOptimizedClipboard.java | 2 +- .../worldedit/command/ClipboardCommands.java | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java b/core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java index 08bf60c0..a5180461 100644 --- a/core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java +++ b/core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java @@ -128,7 +128,7 @@ public class DiskOptimizedClipboard extends FaweClipboard implements Closeable { MainUtil.handleError(e); } this.raf = new BufferedRandomAccessFile(file, "rw", 16); - long volume = width * height * length * 2l + HEADER_SIZE; + long volume = (long) width * (long) height * (long) length * 2l + (long) HEADER_SIZE; raf.setLength(0); raf.setLength(volume); // write length etc diff --git a/core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java b/core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java index 2042b4e4..aecff967 100644 --- a/core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java +++ b/core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java @@ -26,6 +26,7 @@ import com.boydti.fawe.object.FawePlayer; import com.boydti.fawe.object.RunnableVal2; import com.boydti.fawe.object.clipboard.ReadOnlyClipboard; import com.boydti.fawe.object.clipboard.WorldCutClipboard; +import com.boydti.fawe.object.exception.FaweException; import com.boydti.fawe.object.io.FastByteArrayOutputStream; import com.boydti.fawe.util.ImgurUtility; import com.boydti.fawe.util.MaskTraverser; @@ -139,6 +140,12 @@ public class ClipboardCommands { public void copy(Player player, LocalSession session, EditSession editSession, @Selection Region region, @Switch('e') boolean copyEntities, @Switch('m') Mask mask) throws WorldEditException { + Vector min = region.getMinimumPoint(); + Vector max = region.getMaximumPoint(); + long volume = (((long)max.getX() - (long)min.getX() + 1) * ((long)max.getY() - (long)min.getY() + 1) * ((long)max.getZ() - (long)min.getZ() + 1)); + if (volume >= Integer.MAX_VALUE) { + throw new FaweException(BBC.WORLDEDIT_CANCEL_REASON_MAX_CHECKS); + } BlockArrayClipboard clipboard = new BlockArrayClipboard(region, player.getUniqueId()); @@ -175,7 +182,6 @@ public class ClipboardCommands { public void lazyCut(Player player, LocalSession session, EditSession editSession, @Selection final Region region, @Switch('e') boolean copyEntities, @Switch('m') Mask mask) throws WorldEditException { - final Vector origin = region.getMinimumPoint(); final int mx = origin.getBlockX(); final int my = origin.getBlockY(); @@ -205,7 +211,12 @@ public class ClipboardCommands { public void cut(Player player, LocalSession session, EditSession editSession, @Selection Region region, @Optional("air") Pattern leavePattern, @Switch('e') boolean copyEntities, @Switch('m') Mask mask) throws WorldEditException { - + Vector min = region.getMinimumPoint(); + Vector max = region.getMaximumPoint(); + long volume = (((long)max.getX() - (long)min.getX() + 1) * ((long)max.getY() - (long)min.getY() + 1) * ((long)max.getZ() - (long)min.getZ() + 1)); + if (volume >= Integer.MAX_VALUE) { + throw new FaweException(BBC.WORLDEDIT_CANCEL_REASON_MAX_CHECKS); + } BlockArrayClipboard clipboard = new BlockArrayClipboard(region, player.getUniqueId()); clipboard.setOrigin(session.getPlacementPosition(player)); ForwardExtentCopy copy = new ForwardExtentCopy(editSession, region, clipboard, region.getMinimumPoint());