From 480bf2c1d078038bb59c4254a01a5af685c7cb22 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 5 Jun 2014 14:31:44 -0400 Subject: [PATCH 1/5] Fix REPLY handling in SimpleNetworkWrapper. Closes #440 --- .../common/network/simpleimpl/SimpleChannelHandlerWrapper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java b/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java index dbf089502b..06fd2f3d77 100644 --- a/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java +++ b/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java @@ -4,6 +4,7 @@ import org.apache.logging.log4j.Level; import net.minecraft.network.INetHandler; import com.google.common.base.Throwables; import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.network.FMLOutboundHandler; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import io.netty.channel.ChannelFutureListener; @@ -33,6 +34,7 @@ public class SimpleChannelHandlerWrapper Date: Sun, 8 Jun 2014 14:35:16 -0400 Subject: [PATCH 2/5] Tweak bad packet warning some. Makes it a bit more log friendly. --- .../network/internal/FMLProxyPacket.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/cpw/mods/fml/common/network/internal/FMLProxyPacket.java b/src/main/java/cpw/mods/fml/common/network/internal/FMLProxyPacket.java index 7726a615db..e8f16257fa 100644 --- a/src/main/java/cpw/mods/fml/common/network/internal/FMLProxyPacket.java +++ b/src/main/java/cpw/mods/fml/common/network/internal/FMLProxyPacket.java @@ -11,8 +11,12 @@ import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.client.C17PacketCustomPayload; import net.minecraft.network.play.server.S3FPacketCustomPayload; import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.helpers.Integers; +import com.google.common.collect.ConcurrentHashMultiset; +import com.google.common.collect.Multiset; +import com.google.common.collect.Multiset.Entry; +import com.google.common.collect.Multisets; import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.FMLNetworkException; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.handshake.NetworkDispatcher; @@ -24,7 +28,8 @@ public class FMLProxyPacket extends Packet { private final ByteBuf payload; private INetHandler netHandler; private NetworkDispatcher dispatcher; - + private static Multiset badPackets = ConcurrentHashMultiset.create(); + private static int packetCountWarning = Integers.parseInt(System.getProperty("fml.badPacketCounter", "100"), 100); private FMLProxyPacket(byte[] payload, String channel) { this(Unpooled.wrappedBuffer(payload), channel); @@ -71,7 +76,17 @@ public class FMLProxyPacket extends Packet { { if (internalChannel.writeInbound(this)) { - FMLLog.severe("Messages for channel %s for side %s were not processed by the embedded channel %s.\n They have been dropped.\n%s", this.channel, this.target, internalChannel.inboundMessages(), ByteBufUtils.getContentDump(this.payload)); + badPackets.add(this.channel); + if (badPackets.size() % packetCountWarning == 0) + { + FMLLog.severe("Detected ongoing potential memory leak. %d packets have leaked. Top offenders", badPackets.size()); + int i = 0; + for (Entry s : Multisets.copyHighestCountFirst(badPackets).entrySet()) + { + if (i++ > 10) break; + FMLLog.severe("\t %s : %d", s.getElement(), s.getCount()); + } + } } internalChannel.inboundMessages().clear(); } From 1a99ec7db612f258983c6ac685da906bf7cde0a6 Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 8 Jun 2014 21:30:47 -0400 Subject: [PATCH 3/5] Deprecate getAABBPool so people can stop using it in mods. Failure to do so will result in 1.7.10 upgrade incompatibility. Use getBoundingBox instead. --- .../net/minecraft/util/AxisAlignedBB.java.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 patches/minecraft/net/minecraft/util/AxisAlignedBB.java.patch diff --git a/patches/minecraft/net/minecraft/util/AxisAlignedBB.java.patch b/patches/minecraft/net/minecraft/util/AxisAlignedBB.java.patch new file mode 100644 index 0000000000..23a6fc0814 --- /dev/null +++ b/patches/minecraft/net/minecraft/util/AxisAlignedBB.java.patch @@ -0,0 +1,10 @@ +--- ../src-base/minecraft/net/minecraft/util/AxisAlignedBB.java ++++ ../src-work/minecraft/net/minecraft/util/AxisAlignedBB.java +@@ -23,6 +23,7 @@ + return new AxisAlignedBB(p_72330_0_, p_72330_2_, p_72330_4_, p_72330_6_, p_72330_8_, p_72330_10_); + } + ++ @Deprecated /* This method has been deprecated as it no longer exists in 1.7.10. Use getBoundingBox directly. */ + public static AABBPool func_72332_a() + { + return (AABBPool)field_72335_g.get(); From 7219061b05db73d245405ef777b412d0787398b6 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 13 Jun 2014 08:51:07 -0400 Subject: [PATCH 4/5] Also patch in warnings for Vec3Pool - similarly removed. --- .../net/minecraft/world/ChunkCache.java.patch | 10 ++++++++++ .../net/minecraft/world/IBlockAccess.java.patch | 10 ++++++++++ patches/minecraft/net/minecraft/world/World.java.patch | 8 ++++++++ 3 files changed, 28 insertions(+) create mode 100644 patches/minecraft/net/minecraft/world/ChunkCache.java.patch create mode 100644 patches/minecraft/net/minecraft/world/IBlockAccess.java.patch diff --git a/patches/minecraft/net/minecraft/world/ChunkCache.java.patch b/patches/minecraft/net/minecraft/world/ChunkCache.java.patch new file mode 100644 index 0000000000..0a0c41eff2 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/ChunkCache.java.patch @@ -0,0 +1,10 @@ +--- ../src-base/minecraft/net/minecraft/world/ChunkCache.java ++++ ../src-work/minecraft/net/minecraft/world/ChunkCache.java +@@ -133,6 +133,7 @@ + return this.field_72815_e.func_72807_a(p_72807_1_, p_72807_2_); + } + ++ @Deprecated /* gone in 1.7.10, use direct access to Vec3.createVectorHelper instead */ + public Vec3Pool func_82732_R() + { + return this.field_72815_e.func_82732_R(); diff --git a/patches/minecraft/net/minecraft/world/IBlockAccess.java.patch b/patches/minecraft/net/minecraft/world/IBlockAccess.java.patch new file mode 100644 index 0000000000..c4fc18e77a --- /dev/null +++ b/patches/minecraft/net/minecraft/world/IBlockAccess.java.patch @@ -0,0 +1,10 @@ +--- ../src-base/minecraft/net/minecraft/world/IBlockAccess.java ++++ ../src-work/minecraft/net/minecraft/world/IBlockAccess.java +@@ -30,6 +30,7 @@ + @SideOnly(Side.CLIENT) + boolean func_72806_N(); + ++ @Deprecated /* gone in 1.7.10, use direct access to Vec3.createVectorHelper instead */ + Vec3Pool func_82732_R(); + + int func_72879_k(int var1, int var2, int var3, int var4); diff --git a/patches/minecraft/net/minecraft/world/World.java.patch b/patches/minecraft/net/minecraft/world/World.java.patch index 414ce64342..8de55c5db2 100644 --- a/patches/minecraft/net/minecraft/world/World.java.patch +++ b/patches/minecraft/net/minecraft/world/World.java.patch @@ -26,3 +26,11 @@ } public CrashReportCategory func_72914_a(CrashReport p_72914_1_) +@@ -3615,6 +3615,7 @@ + } + } + ++ @Deprecated /* gone in 1.7.10, use direct access to Vec3.createVectorHelper instead */ + public Vec3Pool func_82732_R() + { + return this.field_82741_K; From dff22045587b37282adeb2167486a572f51f1f16 Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 15 Jun 2014 16:37:42 -0400 Subject: [PATCH 5/5] FML now sets a security manager (FINALLY!). It's primary purpose at this point is to catch rogue calls to System.exit so that they can cause a proper crash report, rather than silently abandoning the game. --- .../mods/fml/common/launcher/FMLTweaker.java | 12 +++++++ .../fml/relauncher/FMLSecurityManager.java | 36 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java diff --git a/src/main/java/cpw/mods/fml/common/launcher/FMLTweaker.java b/src/main/java/cpw/mods/fml/common/launcher/FMLTweaker.java index 3131c91ce5..ed0a5c180a 100644 --- a/src/main/java/cpw/mods/fml/common/launcher/FMLTweaker.java +++ b/src/main/java/cpw/mods/fml/common/launcher/FMLTweaker.java @@ -19,6 +19,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import cpw.mods.fml.relauncher.FMLLaunchHandler; +import cpw.mods.fml.relauncher.FMLSecurityManager; public class FMLTweaker implements ITweaker { private File gameDir; @@ -26,6 +27,17 @@ public class FMLTweaker implements ITweaker { private List standaloneArgs; private static URI jarLocation; + public FMLTweaker() + { + try + { + System.setSecurityManager(new FMLSecurityManager()); + } + catch (SecurityException se) + { + throw new RuntimeException("FML was unable to install the security manager. The game will not start", se); + } + } @SuppressWarnings("unchecked") @Override public void acceptOptions(List args, File gameDir, File assetsDir, String profile) diff --git a/src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java b/src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java new file mode 100644 index 0000000000..4c7fba0ec0 --- /dev/null +++ b/src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java @@ -0,0 +1,36 @@ +package cpw.mods.fml.relauncher; + +import java.security.Permission; + +/** + * A custom security manager stopping certain events from happening + * unexpectedly. + * + * @author cpw + * + */ +public class FMLSecurityManager extends SecurityManager { + @Override + public void checkPermission(Permission perm) + { + String permName = perm.getName() != null ? perm.getName() : "missing"; + if (permName.startsWith("exitVM")) + { + String callingClass = getClassContext()[4].getName(); + // FML is allowed to call system exit + if (!callingClass.startsWith("cpw.mods.fml.")) + { + throw new ExitTrappedException(); + } + } + else if ("setSecurityManager".equals(permName)) + { + throw new SecurityException("Cannot replace the FML security manager"); + } + return; + } + + public static class ExitTrappedException extends SecurityException { + private static final long serialVersionUID = 1L; + } +}