Avoid NULL pointer dereference when new_initial_channel(...) fails

7 years ago · 307e8c0180
1 changed files with 2 additions and 3 deletions
--- a/channeld/full_channel.c
+++ b/channeld/full_channel.c
@ -45,10 +45,9 @@ struct channel *new_channel(const tal_t *ctx,
 						      remote_funding_pubkey,
 						      funder);

-	/* Feerates can be different. */
-	channel->view[REMOTE].feerate_per_kw = feerate_per_kw[REMOTE];
-
 	if (channel) {
+		/* Feerates can be different. */
+		channel->view[REMOTE].feerate_per_kw = feerate_per_kw[REMOTE];
 		channel->htlcs = tal(channel, struct htlc_map);
 		htlc_map_init(channel->htlcs);
 		tal_add_destructor(channel->htlcs, htlc_map_clear);