R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Force UnsafeBufferHelper to be classloaded at startup

Browse Source
This commit is contained in:
embeddedt 2023-10-28 09:50:25 -04:00
parent e36ba04921
commit 93fbbfe2d1
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/buffer_builder_leak/BufferBuilderMixin.java
View File

@ -5,6 +5,9 @@ import org.embeddedt.modernfix.ModernFix;
import org.embeddedt.modernfix.render.UnsafeBufferHelper; import org.embeddedt.modernfix.render.UnsafeBufferHelper;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@ -14,6 +17,14 @@ public class BufferBuilderMixin {
private static boolean leakReported = false; private static boolean leakReported = false;
/**
* Ensure UnsafeBufferHelper is classloaded early, to avoid Forge's event transformer showing an error in the log.
*/
@Inject(method = "<clinit>", at = @At(value = "RETURN"))
private static void initUnsafeBufferHelper(CallbackInfo ci) {
UnsafeBufferHelper.init();
}
@Override @Override
protected void finalize() throws Throwable { protected void finalize() throws Throwable {
try { try {

4
common/src/main/java/org/embeddedt/modernfix/render/UnsafeBufferHelper.java
View File

@ -33,6 +33,10 @@ public class UnsafeBufferHelper {
} }
} }
public static void init() {
}
public static void free(ByteBuffer buf) { public static void free(ByteBuffer buf) {
if(UNSAFE != null && ADDRESS >= 0) { if(UNSAFE != null && ADDRESS >= 0) {
// set the address to 0 to prevent double free // set the address to 0 to prevent double free