aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 15:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

paymod: Do not assume that parsing the waitsendpay result succeeds

Browse Source 
Suggested-by: ZmnSCPxj
Signed-off-by: Christian Decker
Reference: #3846
This commit is contained in:
Christian Decker
2020-07-17 13:33:02 +02:00
parent 2788883906
commit 3b54847ae4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/libplugin-pay.c
View File

@@ -627,10 +627,13 @@ static void channel_hints_update(struct payment *root,
static void payment_result_infer(struct route_hop *route,
struct payment_result *r)
{
int i, len = tal_count(route);
int i, len;
assert(r != NULL);
if (r->code == 0 || r->erring_index == NULL || route == NULL)
return;
len = tal_count(route);
i = *r->erring_index;
assert(i <= len);
@@ -659,13 +662,14 @@ payment_waitsendpay_finished(struct command *cmd, const char *buffer,
assert(p->route != NULL);
p->result = tal_sendpay_result_from_json(p, buffer, toks);
payment_result_infer(p->route, p->result);
if (p->result == NULL)
plugin_err(
p->plugin, "Unable to parse `waitsendpay` result: %.*s",
json_tok_full_len(toks), json_tok_full(buffer, toks));
payment_result_infer(p->route, p->result);
if (p->result->state == PAYMENT_COMPLETE) {
payment_set_step(p, PAYMENT_STEP_SUCCESS);
p->end_time = time_now();