X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FSign.java;h=1c14591d20d48a159a8a0ed315632797fba61cbb;hb=890e35a4387758c0447aab34166caa579bbf3a08;hp=48268cdeb342cbcdb771d72cd3a871036a647ff6;hpb=32692e00046b7ec16b6a2e20bd54800b2b48d4c0;p=ldk-java diff --git a/src/main/java/org/ldk/structs/Sign.java b/src/main/java/org/ldk/structs/Sign.java index 48268cde..1c14591d 100644 --- a/src/main/java/org/ldk/structs/Sign.java +++ b/src/main/java/org/ldk/structs/Sign.java @@ -4,6 +4,7 @@ import org.ldk.impl.bindings; import org.ldk.enums.*; import org.ldk.util.*; import java.util.Arrays; +import java.lang.ref.Reference; import javax.annotation.Nullable; /** @@ -18,7 +19,7 @@ public class Sign extends CommonBase { final bindings.LDKSign bindings_instance; Sign(Object _dummy, long ptr) { super(ptr); bindings_instance = null; } private Sign(bindings.LDKSign arg, bindings.LDKBaseSign BaseSign, ChannelPublicKeys pubkeys) { - super(bindings.LDKSign_new(arg, BaseSign, pubkeys == null ? 0 : pubkeys.ptr & ~1)); + super(bindings.LDKSign_new(arg, BaseSign, pubkeys == null ? 0 : pubkeys.clone_ptr())); this.ptrs_to.add(arg); this.ptrs_to.add(BaseSign); this.bindings_instance = arg; @@ -40,6 +41,7 @@ public class Sign extends CommonBase { impl_holder.held = new Sign(new bindings.LDKSign() { @Override public byte[] write() { byte[] ret = arg.write(); + Reference.reachabilityFence(arg); return ret; } }, BaseSign.new_impl(BaseSign_impl, pubkeys).bindings_instance, pubkeys); @@ -60,6 +62,13 @@ public class Sign extends CommonBase { */ public byte[] write() { byte[] ret = bindings.Sign_write(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + + long clone_ptr() { + long ret = bindings.Sign_clone_ptr(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -68,9 +77,10 @@ public class Sign extends CommonBase { */ public Sign clone() { long ret = bindings.Sign_clone(this.ptr); - if (ret >= 0 && ret < 1024) { return null; } + Reference.reachabilityFence(this); + if (ret >= 0 && ret <= 4096) { return null; } Sign ret_hu_conv = new Sign(null, ret); - ret_hu_conv.ptrs_to.add(this); + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; }