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

plugins/pay.c: add curly braces arround JSON data field

Browse Source 
fixes #2698
This commit is contained in:
Simon Vrouwe
2019-06-04 13:03:02 +03:00
committed by Rusty Russell
parent e1dbc0b12b
commit bbedd3819d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -54,6 +54,7 @@ changes.
- Fixed `fundchannel` crash when we have many UTXOs and we skip unconfirmed ones. - Fixed `fundchannel` crash when we have many UTXOs and we skip unconfirmed ones.
- lightningd: fixed occasional hang on `connect` when peer had sent error. - lightningd: fixed occasional hang on `connect` when peer had sent error.
- JSON RPC: `decodeinvoice` and `pay` now handle unknown invoice fields properly. - JSON RPC: `decodeinvoice` and `pay` now handle unknown invoice fields properly.
- JSON API: `waitsendpay` (PAY_STOPPED_RETRYING) error handler now returns valid JSON
### Security ### Security

4
plugins/pay.c
View File

@@ -168,7 +168,7 @@ static struct command_result *waitsendpay_expired(struct command *cmd,
errmsg = tal_fmt(pc, "Gave up after %zu attempts", errmsg = tal_fmt(pc, "Gave up after %zu attempts",
tal_count(pc->ps->attempts)); tal_count(pc->ps->attempts));
data = tal_strdup(pc, "'attempts': [ "); data = tal_strdup(pc, "{ 'attempts': [ ");
for (size_t i = 0; i < tal_count(pc->ps->attempts); i++) { for (size_t i = 0; i < tal_count(pc->ps->attempts); i++) {
if (pc->ps->attempts[i].route) if (pc->ps->attempts[i].route)
tal_append_fmt(&data, "%s { 'route': %s,\n 'failure': %s\n }", tal_append_fmt(&data, "%s { 'route': %s,\n 'failure': %s\n }",
@@ -180,7 +180,7 @@ static struct command_result *waitsendpay_expired(struct command *cmd,
i == 0 ? "" : ",", i == 0 ? "" : ",",
pc->ps->attempts[i].failure); pc->ps->attempts[i].failure);
} }
tal_append_fmt(&data, "]"); tal_append_fmt(&data, "] }");
return command_done_err(cmd, PAY_STOPPED_RETRYING, errmsg, data); return command_done_err(cmd, PAY_STOPPED_RETRYING, errmsg, data);
} }