mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-26 20:30:59 +01:00
Code Issues Projects Releases Wiki Activity

gossmap: don't crash on localmods on non-existant channels.

Browse source 
We allow adding them, but crash when we remove the localmods.  Yet
this could theoretically happen if a channel we modified was removed
from the gossmap, anyway.

Reported-by: Lagrang3 <lagrang3@protonmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2024-10-04 08:48:53 +09:30
parent 0a23c63d37
commit bc1aabb014
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/gossmap.c
View file

@ -980,6 +980,10 @@ void gossmap_remove_localmods(struct gossmap *map,
const struct localmod *mod = &localmods->mods[i];
struct gossmap_chan *chan = gossmap_find_chan(map, &mod->scid);
/* If there was no channel, ignore */
if (!chan)
continue;
/* If that's a local channel, remove it now. */
if (chan->cann_off >= map->map_size) {
gossmap_remove_chan(map, chan);

11
common/test/run-gossmap_local.c
View file

@ -333,7 +333,7 @@ int main(int argc, char *argv[])
char *gossfile;
struct gossmap *map;
struct node_id l1, l2, l3, l4;
struct short_channel_id scid23, scid12, scid_local;
struct short_channel_id scid23, scid12, scid_local, scid_nonexisting;
struct gossmap_chan *chan;
struct gossmap_localmods *mods;
struct amount_sat capacity;
@ -498,6 +498,13 @@ int main(int argc, char *argv[])
AMOUNT_MSAT(100),
101, 102, 103, true, 0);
/* We can "update" a channel which doesn't exist, and it's a noop */
scid_nonexisting.u64 = 1;
gossmap_local_updatechan(mods, scid_nonexisting,
AMOUNT_MSAT(1),
AMOUNT_MSAT(100000),
2, 3, 4, false, 0);
gossmap_apply_localmods(map, mods);
chan = gossmap_find_chan(map, &scid_local);
assert(gossmap_chan_set(chan, 0));
@ -510,6 +517,8 @@ int main(int argc, char *argv[])
assert(chan->half[0].proportional_fee == 3);
assert(chan->half[0].delay == 4);
assert(!gossmap_find_chan(map, &scid_nonexisting));
chan = gossmap_find_chan(map, &scid23);
assert(chan->half[0].enabled);
assert(chan->half[0].htlc_min == u64_to_fp16(99, false));