From 307e8c0180580414b112dd7c1e79d2f7d876b879 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Fri, 8 Dec 2017 16:13:03 +0100 Subject: [PATCH] Avoid NULL pointer dereference when new_initial_channel(...) fails --- channeld/full_channel.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/channeld/full_channel.c b/channeld/full_channel.c index cf1b0549b..220ccb6d9 100644 --- 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);