From 9ed7041c4602c8ed1abb2b86337a5d211b8b108c Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 18 Jan 2018 06:59:50 +1030 Subject: [PATCH] bitcoind: if callback says don't call on error, dont. Signed-off-by: Rusty Russell --- lightningd/bitcoind.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lightningd/bitcoind.c b/lightningd/bitcoind.c index d5a6cab5b..f2486e9f4 100644 --- a/lightningd/bitcoind.c +++ b/lightningd/bitcoind.c @@ -140,6 +140,8 @@ static void bcli_finished(struct io_conn *conn, struct bitcoin_cli *bcli) (int)bcli->output_bytes, bcli->output); bitcoind->error_count++; + + goto done; } } else *bcli->exitstatus = WEXITSTATUS(status); @@ -156,6 +158,8 @@ static void bcli_finished(struct io_conn *conn, struct bitcoin_cli *bcli) db_begin_transaction(bitcoind->ld->wallet->db); bcli->process(bcli); db_commit_transaction(bitcoind->ld->wallet->db); + +done: tal_free(bcli); next_bcli(bitcoind);