diff options
| author | fanquake <fanquake@gmail.com> | 2024-02-26 11:34:10 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-02-26 11:54:29 +0000 |
| commit | 1ce5accc325cd7d3382f67a314dec018cfdc0a3e (patch) | |
| tree | ffc2f9987ce3c0cf73e5ba550e0b578fc21e422f /src/pubkey.h | |
| parent | 8087626cbda97f6def4fb51cdac6f204486ee6fb (diff) | |
| parent | 9f13dc1ed3020d55ba79b1a62ca0db6b510357ab (diff) | |
Merge bitcoin/bitcoin#29464: [25.2] Final backports and changes for 25.2rc1v25.2rc1
9f13dc1ed3020d55ba79b1a62ca0db6b510357ab doc: Update release notes for 25.2rc1 (Ava Chow)
a27662b16a626ade5f26613e9f5323edcd6e9105 doc: update manpages for 25.2rc1 (Ava Chow)
65c617178420d5904fd43399eb3c87e00aff524e build: Bump to 25.2rc1 (Ava Chow)
cf0f43ee42f0bf8d345b109b0ba552faf7cb62e1 wallet: Fix use-after-free in WalletBatch::EraseRecords (MarcoFalke)
6acfc4324cc98a10e083e5f391435bbfde4d8f69 Use only Span{} constructor for byte-like types where possible (MarcoFalke)
b40d10787b2dc161e236e50eb296bdf02f93933f util: Allow std::byte and char Span serialization (MarcoFalke)
Pull request description:
Backport:
* #29176
* #27927
#29176 does not cleanly backport, and it also requires 27927 to work. Both are still fairly simple backports.
Also does the rest of the version bump tasks for 25.2rc1.
ACKs for top commit:
fanquake:
ACK 9f13dc1ed3020d55ba79b1a62ca0db6b510357ab
Tree-SHA512: 9d9dbf415f8559410eba9a431b61a8fc94216898d2d1fd8398e1f7a22a04790faade810e65324c7a797456b33396c3a58f991e81319aaaa63d3ab441e5e20dbc
Diffstat (limited to 'src/pubkey.h')
| -rw-r--r-- | src/pubkey.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pubkey.h b/src/pubkey.h index b3edafea7f..d7337453ab 100644 --- a/src/pubkey.h +++ b/src/pubkey.h @@ -142,14 +142,14 @@ public: { unsigned int len = size(); ::WriteCompactSize(s, len); - s.write(AsBytes(Span{vch, len})); + s << Span{vch, len}; } template <typename Stream> void Unserialize(Stream& s) { const unsigned int len(::ReadCompactSize(s)); if (len <= SIZE) { - s.read(AsWritableBytes(Span{vch, len})); + s >> Span{vch, len}; if (len != size()) { Invalidate(); } |