mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

listinvoice: don't crash if listinvoice given a non-bolt11 string.

Browse Source 
Discovered by the next test, oops.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Fixed: JSONRPC: `listinvoice` no longer crashes if given an invalid (or bolt12) `invstring` argument.
This commit is contained in:
Rusty Russell 2021-07-01 13:53:25 +09:30
parent 9a48221892
commit 68962083e7
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lightningd/invoice.c
View File

@ -1311,7 +1311,6 @@ static struct command_result *json_listinvoices(struct command *cmd,
const char *invstring;
struct sha256 *payment_hash;
char *fail;
struct bolt11 *b11;
if (!param(cmd, buffer, params,
p_opt("label", param_label, &label),
@ -1329,9 +1328,23 @@ static struct command_result *json_listinvoices(struct command *cmd,
/* Extract the payment_hash from the invoice. */
if (invstring != NULL) {
struct bolt11 *b11;
b11 = bolt11_decode(cmd, invstring, cmd->ld->our_features, NULL,
NULL, &fail);
payment_hash = &b11->payment_hash;
if (b11)
payment_hash = &b11->payment_hash;
else {
struct tlv_invoice *b12
= invoice_decode(tmpctx, invstring,
strlen(invstring),
cmd->ld->our_features, NULL,
&fail);
if (!b12 || !b12->payment_hash) {
return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
"Invalid invstring");
}
payment_hash = b12->payment_hash;
}
}
response = json_stream_success(cmd);