Merge pull request #117 from TheBlueMatt/2022-08-fix-npe

[TS+Java] Ensure we don't try to add a reference from null.

Author: TheBlueMatt

java_strings.py

@@ -704,7 +704,7 @@ def set_null_skip_free(self, var):
         return var + ".ptr" + " = 0;"
 
     def add_ref(self, holder, referent):
-        return holder + ".ptrs_to.add(" + referent + ")"
+        return "if (" + holder + " != null) { " + holder + ".ptrs_to.add(" + referent + "); }"
 
     def fully_qualified_hu_ty_path(self, ty):
         if ty.java_fn_ty_arg.startswith("L") and ty.java_fn_ty_arg.endswith(";"):

src/main/java/org/ldk/structs/APIError.java

@@ -134,7 +134,7 @@ private IncompatibleShutdownScript(long ptr, bindings.LDKAPIError.IncompatibleSh
 			super(null, ptr);
 			long script = obj.script;
 			org.ldk.structs.ShutdownScript script_hu_conv = null; if (script < 0 || script > 4096) { script_hu_conv = new org.ldk.structs.ShutdownScript(null, script); }
-			script_hu_conv.ptrs_to.add(this);
+			if (script_hu_conv != null) { script_hu_conv.ptrs_to.add(this); };
 			this.script = script_hu_conv;
 		}
 	}
@@ -152,7 +152,7 @@ public APIError clone() {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.APIError ret_hu_conv = org.ldk.structs.APIError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(this);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -164,7 +164,7 @@ public static APIError apimisuse_error(java.lang.String err) {
 		Reference.reachabilityFence(err);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.APIError ret_hu_conv = org.ldk.structs.APIError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -177,7 +177,7 @@ public static APIError fee_rate_too_high(java.lang.String err, int feerate) {
 		Reference.reachabilityFence(feerate);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.APIError ret_hu_conv = org.ldk.structs.APIError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -189,7 +189,7 @@ public static APIError route_error(java.lang.String err) {
 		Reference.reachabilityFence(err);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.APIError ret_hu_conv = org.ldk.structs.APIError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -201,7 +201,7 @@ public static APIError channel_unavailable(java.lang.String err) {
 		Reference.reachabilityFence(err);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.APIError ret_hu_conv = org.ldk.structs.APIError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -212,7 +212,7 @@ public static APIError monitor_update_failed() {
 		long ret = bindings.APIError_monitor_update_failed();
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.APIError ret_hu_conv = org.ldk.structs.APIError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -224,8 +224,8 @@ public static APIError incompatible_shutdown_script(ShutdownScript script) {
 		Reference.reachabilityFence(script);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.APIError ret_hu_conv = org.ldk.structs.APIError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(script);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(script); };
 		return ret_hu_conv;
 	}
 

src/main/java/org/ldk/structs/AcceptChannel.java

@@ -287,7 +287,7 @@ public ChannelTypeFeatures get_channel_type() {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.ChannelTypeFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelTypeFeatures(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;
 	}
 
@@ -304,7 +304,7 @@ public void set_channel_type(@Nullable ChannelTypeFeatures val) {
 		bindings.AcceptChannel_set_channel_type(this.ptr, val == null ? 0 : val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
-		this.ptrs_to.add(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	long clone_ptr() {
@@ -321,7 +321,7 @@ public AcceptChannel clone() {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.AcceptChannel ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.AcceptChannel(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;
 	}
 

src/main/java/org/ldk/structs/AnnouncementSignatures.java

@@ -103,7 +103,7 @@ public static AnnouncementSignatures of(byte[] channel_id_arg, long short_channe
 		Reference.reachabilityFence(bitcoin_signature_arg);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.AnnouncementSignatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.AnnouncementSignatures(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -121,7 +121,7 @@ public AnnouncementSignatures clone() {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.AnnouncementSignatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.AnnouncementSignatures(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;
 	}
 

src/main/java/org/ldk/structs/BackgroundProcessor.java

@@ -104,14 +104,14 @@ public static BackgroundProcessor start(Persister persister, EventHandler event_
 		Reference.reachabilityFence(scorer);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.BackgroundProcessor ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.BackgroundProcessor(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(persister);
-		ret_hu_conv.ptrs_to.add(event_handler);
-		ret_hu_conv.ptrs_to.add(chain_monitor);
-		ret_hu_conv.ptrs_to.add(channel_manager);
-		ret_hu_conv.ptrs_to.add(peer_manager);
-		ret_hu_conv.ptrs_to.add(logger);
-		ret_hu_conv.ptrs_to.add(scorer);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(persister); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(event_handler); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(chain_monitor); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(channel_manager); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(peer_manager); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(logger); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(scorer); };
 		return ret_hu_conv;
 	}
 
@@ -131,7 +131,7 @@ public Result_NoneErrorZ join() {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneErrorZ ret_hu_conv = Result_NoneErrorZ.constr_from_ptr(ret);
-		this.ptrs_to.add(this);
+		if (this != null) { this.ptrs_to.add(this); };
 		// Due to rust's strict-ownership memory model, in some cases we need to "move"
 		// an object to pass exclusive ownership to the function being called.
 		// In most cases, we avoid this being visible in GC'd languages by cloning the object
@@ -159,7 +159,7 @@ public Result_NoneErrorZ stop() {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneErrorZ ret_hu_conv = Result_NoneErrorZ.constr_from_ptr(ret);
-		this.ptrs_to.add(this);
+		if (this != null) { this.ptrs_to.add(this); };
 		// Due to rust's strict-ownership memory model, in some cases we need to "move"
 		// an object to pass exclusive ownership to the function being called.
 		// In most cases, we avoid this being visible in GC'd languages by cloning the object

src/main/java/org/ldk/structs/Balance.java

@@ -138,7 +138,7 @@ public Balance clone() {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.Balance ret_hu_conv = org.ldk.structs.Balance.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(this);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -150,7 +150,7 @@ public static Balance claimable_on_channel_close(long claimable_amount_satoshis)
 		Reference.reachabilityFence(claimable_amount_satoshis);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.Balance ret_hu_conv = org.ldk.structs.Balance.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -163,7 +163,7 @@ public static Balance claimable_awaiting_confirmations(long claimable_amount_sat
 		Reference.reachabilityFence(confirmation_height);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.Balance ret_hu_conv = org.ldk.structs.Balance.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -176,7 +176,7 @@ public static Balance contentious_claimable(long claimable_amount_satoshis, int
 		Reference.reachabilityFence(timeout_height);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.Balance ret_hu_conv = org.ldk.structs.Balance.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -189,7 +189,7 @@ public static Balance maybe_claimable_htlcawaiting_timeout(long claimable_amount
 		Reference.reachabilityFence(claimable_height);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.Balance ret_hu_conv = org.ldk.structs.Balance.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 

src/main/java/org/ldk/structs/BaseSign.java

@@ -349,7 +349,7 @@ public Result_NoneNoneZ validate_holder_commitment(HolderCommitmentTransaction h
 		Reference.reachabilityFence(preimages);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneNoneZ ret_hu_conv = Result_NoneNoneZ.constr_from_ptr(ret);
-		this.ptrs_to.add(holder_tx);
+		if (this != null) { this.ptrs_to.add(holder_tx); };
 		return ret_hu_conv;
 	}
 
@@ -386,7 +386,7 @@ public Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitmen
 		Reference.reachabilityFence(preimages);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_hu_conv = Result_C2Tuple_SignatureCVec_SignatureZZNoneZ.constr_from_ptr(ret);
-		this.ptrs_to.add(commitment_tx);
+		if (this != null) { this.ptrs_to.add(commitment_tx); };
 		return ret_hu_conv;
 	}
 
@@ -425,7 +425,7 @@ public Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_holder_commitment_and_
 		Reference.reachabilityFence(commitment_tx);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_hu_conv = Result_C2Tuple_SignatureCVec_SignatureZZNoneZ.constr_from_ptr(ret);
-		this.ptrs_to.add(commitment_tx);
+		if (this != null) { this.ptrs_to.add(commitment_tx); };
 		return ret_hu_conv;
 	}
 
@@ -486,7 +486,7 @@ public Result_SignatureNoneZ sign_justice_revoked_htlc(byte[] justice_tx, long i
 		Reference.reachabilityFence(htlc);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_SignatureNoneZ ret_hu_conv = Result_SignatureNoneZ.constr_from_ptr(ret);
-		this.ptrs_to.add(htlc);
+		if (this != null) { this.ptrs_to.add(htlc); };
 		return ret_hu_conv;
 	}
 
@@ -519,7 +519,7 @@ public Result_SignatureNoneZ sign_counterparty_htlc_transaction(byte[] htlc_tx,
 		Reference.reachabilityFence(htlc);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_SignatureNoneZ ret_hu_conv = Result_SignatureNoneZ.constr_from_ptr(ret);
-		this.ptrs_to.add(htlc);
+		if (this != null) { this.ptrs_to.add(htlc); };
 		return ret_hu_conv;
 	}
 
@@ -535,7 +535,7 @@ public Result_SignatureNoneZ sign_closing_transaction(ClosingTransaction closing
 		Reference.reachabilityFence(closing_tx);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_SignatureNoneZ ret_hu_conv = Result_SignatureNoneZ.constr_from_ptr(ret);
-		this.ptrs_to.add(closing_tx);
+		if (this != null) { this.ptrs_to.add(closing_tx); };
 		return ret_hu_conv;
 	}
 
@@ -556,7 +556,7 @@ public Result_C2Tuple_SignatureSignatureZNoneZ sign_channel_announcement(Unsigne
 		Reference.reachabilityFence(msg);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_C2Tuple_SignatureSignatureZNoneZ ret_hu_conv = Result_C2Tuple_SignatureSignatureZNoneZ.constr_from_ptr(ret);
-		this.ptrs_to.add(msg);
+		if (this != null) { this.ptrs_to.add(msg); };
 		return ret_hu_conv;
 	}
 
@@ -576,7 +576,7 @@ public void ready_channel(ChannelTransactionParameters channel_parameters) {
 		bindings.BaseSign_ready_channel(this.ptr, channel_parameters == null ? 0 : channel_parameters.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(channel_parameters);
-		this.ptrs_to.add(channel_parameters);
+		if (this != null) { this.ptrs_to.add(channel_parameters); };
 	}
 
 	/**
@@ -588,7 +588,7 @@ public ChannelPublicKeys get_pubkeys() {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.ChannelPublicKeys ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelPublicKeys(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;
 	}
 

src/main/java/org/ldk/structs/Bech32Error.java

@@ -119,7 +119,7 @@ public Bech32Error clone() {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.Bech32Error ret_hu_conv = org.ldk.structs.Bech32Error.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(this);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 

src/main/java/org/ldk/structs/BestBlock.java

@@ -34,7 +34,7 @@ public BestBlock clone() {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.BestBlock ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.BestBlock(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;
 	}
 
@@ -47,7 +47,7 @@ public static BestBlock from_genesis(org.ldk.enums.Network network) {
 		Reference.reachabilityFence(network);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.BestBlock ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.BestBlock(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -60,7 +60,7 @@ public static BestBlock of(byte[] block_hash, int height) {
 		Reference.reachabilityFence(height);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.BestBlock ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.BestBlock(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 

src/main/java/org/ldk/structs/BigSize.java

@@ -46,7 +46,7 @@ public static BigSize of(long a_arg) {
 		Reference.reachabilityFence(a_arg);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.BigSize ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.BigSize(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}