Skip to content

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Nov 29, 2018

Backports #14593, #14596, #14618, #14690 and #14728 to the 0.17 branch.

kazcw and others added 4 commits November 29, 2018 18:32
Reachable from either place where SetIP is used when our best-guess
addrLocal for a peer is IPv4, but the peer tells us it's reaching us at
an IPv6 address.

In that case, SetIP turns an IPv4 address into an IPv6 address without
setting the scopeId, which is subsequently read in GetSockAddr during
CNetAddr::ToStringIP and passed to getnameinfo. Fix by ensuring every
constructor initializes the scopeId field with something.

Github-Pull: bitcoin#14728
Rebased-From: b7b36de
@fanquake fanquake changed the title [0.17] Backport #14593, #14596 and #14690 [0.17] Further Backports Nov 29, 2018
@maflcko
Copy link
Member

maflcko commented Nov 29, 2018

utACK 7935881

@gmaxwell
Copy link
Contributor

utACK

@fanquake
Copy link
Member Author

I've added fa21568 from #14700.
The first commit (6c787d3) which removes a : to make the tests pass on CentOS doesn't seem to need a backport.

@maflcko maflcko merged commit f9db08e into bitcoin:0.17 Nov 30, 2018
maflcko pushed a commit that referenced this pull request Nov 30, 2018
f9db08e qa: Avoid race in p2p_invalid_block by waiting for the block request (MarcoFalke)
7935881 Add SAFE_CHARS[SAFE_CHARS_URI]: Chars allowed in URIs (RFC 3986) (practicalswift)
9666dba rpc: Make HTTP RPC debug logging more informative (practicalswift)
b901578 add test demonstrating addrLocal UB (Kaz Wesley)
6f04264 fix uninitialized read when stringifying an addrLocal (Kaz Wesley)
5782fdc Throw error if CPubKey is invalid during PSBT keypath serialization (Gregory Sanders)
de5e48a Bugfix: RPC: Add address_type named param for createmultisig (Luke Dashjr)
df5131b gui: explicitly disable "Dark Mode" appearance on macOS (fanquake)

Pull request description:

  Backports #14593, #14596, #14618, #14690 and #14728 to the 0.17 branch.

Tree-SHA512: fcda4b75fcb71bb80cc8bde2a2b98ff5c0239dfa754ac980b1a91a90409502ac7678326399a4fc03a773074339dbf8b3d11750c91fe4302741a954745acfcca1
@fanquake fanquake deleted the further-0-17-backports branch November 30, 2018 22:30
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants