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

plugins/pay: handle case where amount_msat is 'null'.

Browse Source 
Deprecated, but this can happen:

```
==1578== Conditional jump or move depends on uninitialised value(s)
==1578== at 0x12B30E: amount_msat_add (amount.c:224)
==1578== by 0x11270B: add_amount_sent (pay.c:1734)
==1578== by 0x112D89: listsendpays_done (pay.c:1831)
==1578== by 0x114F4B: handle_rpc_reply (libplugin.c:555)
==1578== by 0x115704: rpc_read_response_one (libplugin.c:685)
==1578== by 0x115821: rpc_conn_read_response (libplugin.c:705)
==1578== by 0x148E40: next_plan (io.c:59)
==1578== by 0x1499BD: do_plan (io.c:407)
==1578== by 0x1499FB: io_ready (io.c:417)
==1578== by 0x14BBC1: io_loop (poll.c:445)
==1578== by 0x117A82: plugin_main (libplugin.c:1322)
==1578== by 0x113ABC: main (pay.c:2096)
```

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2020-09-11 10:30:09 +09:30
parent dcf45b47b3
commit 1deba1c8e4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/pay.c
View File

@@ -1719,7 +1719,8 @@ static void add_amount_sent(struct plugin *p,
/* If this is an unannotated partial payment we drop out estimate for /* If this is an unannotated partial payment we drop out estimate for
* all parts. */ * all parts. */
if (msattok == NULL) { /* FIXME: with deprecated_apis, amount_msat can be 'null' */
if (msattok == NULL || !json_to_msat(buf, msattok, &recv)) {
mpp->amount = tal_free(mpp->amount); mpp->amount = tal_free(mpp->amount);
return; return;
} }
@@ -1730,7 +1731,6 @@ static void add_amount_sent(struct plugin *p,
if (mpp->amount == NULL) if (mpp->amount == NULL)
return; return;
json_to_msat(buf, msattok, &recv);
if (!amount_msat_add(mpp->amount, *mpp->amount, recv)) if (!amount_msat_add(mpp->amount, *mpp->amount, recv))
plugin_log(p, LOG_BROKEN, plugin_log(p, LOG_BROKEN,
"Cannot add amount_msat for %s: %s + %s", "Cannot add amount_msat for %s: %s + %s",