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

30
common/htlc_wire.c
View File

@@ -25,6 +25,23 @@ static struct failed_htlc *failed_htlc_dup(const tal_t *ctx,
return newf;
}
/* Helper to duplicate an array of tlv_field (vs an array of tlv_field *) */
struct tlv_field *tlv_field_arr_dup(const tal_t *ctx,
const struct tlv_field *arr TAKES)
{
struct tlv_field *ret;
bool needs_copy = !is_taken(arr);
ret = tal_dup_talarr(ctx, struct tlv_field, arr);
if (needs_copy) {
for (size_t i = 0; i < tal_count(ret); i++) {
/* We need to attach the value to the correct parent */
ret[i].value = tal_dup_talarr(ret, u8, ret[i].value);
}
}
return ret;
}
struct existing_htlc *new_existing_htlc(const tal_t *ctx,
u64 id,
enum htlc_state state,
@@ -53,17 +70,10 @@ struct existing_htlc *new_existing_htlc(const tal_t *ctx,
existing->failed = failed_htlc_dup(existing, failed);
else
existing->failed = NULL;
if (extra_tlvs) {
existing->extra_tlvs = tal_dup_talarr(existing, 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 */
existing->extra_tlvs[i].value
= tal_dup_talarr(existing, u8,
existing->extra_tlvs[i].value);
}
} else {
if (extra_tlvs)
existing->extra_tlvs = tlv_field_arr_dup(existing, extra_tlvs);
else
existing->extra_tlvs = NULL;
}
return existing;
}

4
common/htlc_wire.h
View File

@@ -62,6 +62,10 @@ struct changed_htlc {
u64 id;
};
/* Helper to duplicate an array of tlv_field (vs an array of tlv_field *) */
struct tlv_field *tlv_field_arr_dup(const tal_t *ctx,
const struct tlv_field *arr TAKES);
struct existing_htlc *new_existing_htlc(const tal_t *ctx,
u64 id,
enum htlc_state state,