Warn instead of crash when extract_feerate(...) fails

Fixes: #722
This commit is contained in:
practicalswift 2018-01-23 16:08:51 +01:00 committed by Rusty Russell
parent 0557467dfa
commit 3a8220d630
1 changed files with 7 additions and 4 deletions

View File

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