davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

common: handle taken() extra_tlvs in new_existing_htlc properly.

Browse Source 
Reported-by: Christian Decker
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2025-08-14 11:22:41 +09:30
parent 5c1fd782ec
commit 63065aa99c
3 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lightningd/htlc_end.c
View File

@@ -3,6 +3,7 @@
#include <ccan/crypto/siphash24/siphash24.h>
#include <ccan/tal/str/str.h>
#include <common/htlc.h>
#include <common/htlc_wire.h>
#include <common/pseudorand.h>
#include <lightningd/htlc_end.h>
#include <lightningd/log.h>
@@ -148,15 +149,10 @@ struct htlc_in *new_htlc_in(const tal_t *ctx,
hin->path_key = tal_dup_or_null(hin, struct pubkey, path_key);
memcpy(hin->onion_routing_packet, onion_routing_packet,
sizeof(hin->onion_routing_packet));
if (extra_tlvs) {
hin->extra_tlvs = tal_dup_talarr(hin, struct tlv_field, extra_tlvs);
for (size_t i = 0; i < tal_count(extra_tlvs); i++) {
/* We need to attach the value to the correct parent */
hin->extra_tlvs[i].value = tal_dup_talarr(hin, u8, hin->extra_tlvs[i].value);
}
} else {
if (extra_tlvs)
hin->extra_tlvs = tlv_field_arr_dup(hin, extra_tlvs);
else
hin->extra_tlvs = NULL;
}
hin->hstate = RCVD_ADD_COMMIT;
hin->badonion = 0;
@@ -304,15 +300,10 @@ struct htlc_out *new_htlc_out(const tal_t *ctx,
hout->path_key = tal_dup_or_null(hout, struct pubkey, path_key);
if (extra_tlvs) {
hout->extra_tlvs = tal_dup_talarr(hout, struct tlv_field, extra_tlvs);
for (size_t i = 0; i < tal_count(extra_tlvs); i++) {
/* We need to attach the value to the correct parent */
hout->extra_tlvs[i].value = tal_dup_talarr(hout, u8, hout->extra_tlvs[i].value);
}
} else {
if (extra_tlvs)
hout->extra_tlvs = tlv_field_arr_dup(hout, extra_tlvs);
else
hout->extra_tlvs = NULL;
}
hout->am_origin = am_origin;
if (am_origin) {