mirror of
https://github.com/aljazceru/lightning.git
synced 2026-01-06 07:34:21 +01:00
Update ccan/structeq.
structeq() is too dangerous: if a structure has padding, it can fail silently. The new ccan/structeq instead provides a macro to define foo_eq(), which does the right thing in case of padding (which none of our structures currently have anyway). Upgrade ccan, and use it everywhere. Except run-peer-wire.c, which is only testing code and can use raw memcmp(): valgrind will tell us if padding exists. Interestingly, we still declared short_channel_id_eq, even though we didn't define it any more! Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
committed by
Christian Decker
parent
4a1ca0fb99
commit
fed5a117e7
@@ -741,7 +741,7 @@ void onchain_fulfilled_htlc(struct channel *channel,
|
||||
if (hout->failcode != 0 || hout->failuremsg)
|
||||
continue;
|
||||
|
||||
if (!structeq(&hout->payment_hash, &payment_hash))
|
||||
if (!sha256_eq(&hout->payment_hash, &payment_hash))
|
||||
continue;
|
||||
|
||||
/* We may have already fulfilled before going onchain, or
|
||||
@@ -803,7 +803,7 @@ struct htlc_out *find_htlc_out_by_ripemd(const struct channel *channel,
|
||||
|
||||
ripemd160(&hash,
|
||||
&hout->payment_hash, sizeof(hout->payment_hash));
|
||||
if (structeq(&hash, ripemd))
|
||||
if (ripemd160_eq(&hash, ripemd))
|
||||
return hout;
|
||||
}
|
||||
return NULL;
|
||||
|
||||
Reference in New Issue
Block a user