From 3a8220d630398f93213a4d35e8e5b29b9b01cb51 Mon Sep 17 00:00:00 2001
From: practicalswift <practicalswift@users.noreply.github.com>
Date: Tue, 23 Jan 2018 16:08:51 +0100
Subject: [PATCH] Warn instead of crash when extract_feerate(...) fails

Fixes: #722
---
 lightningd/bitcoind.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lightningd/bitcoind.c b/lightningd/bitcoind.c
index f2486e9f4..19f55f92d 100644
--- a/lightningd/bitcoind.c
+++ b/lightningd/bitcoind.c
@@ -255,10 +255,13 @@ static bool extract_feerate(struct bitcoin_cli *bcli,
 		      bcli_args(bcli),
 		      valid ? "partial" : "invalid");
 
-	if (tokens[0].type != JSMN_OBJECT)
-		fatal("%s: gave non-object (%.*s)?",
-		      bcli_args(bcli),
-		      (int)output_bytes, output);
+	if (tokens[0].type != JSMN_OBJECT) {
+		log_unusual(bcli->bitcoind->log,
+			    "%s: gave non-object (%.*s)?",
+			    bcli_args(bcli),
+			    (int)output_bytes, output);
+		return false;
+	}
 
 	feeratetok = json_get_member(output, tokens, "feerate");
 	if (!feeratetok)