akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rpcserver: add nil check to policy ordering

Browse Source 
Fixes #5301.
This was introduced with #5295. Since either policies can be nil, we
need to always check that first.
This commit is contained in:
Oliver Gugger 2021-05-17 09:36:05 +02:00
parent cfa7188b1d
commit 3a5a03fa49
No known key found for this signature in database
GPG Key ID: 8E4256593F177720
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rpcserver.go
View File

@ -5166,13 +5166,8 @@ func marshalDbEdge(edgeInfo *channeldb.ChannelEdgeInfo,
// Make sure the policies match the node they belong to. c1 should point
// to the policy for NodeKey1, and c2 for NodeKey2.
if c1.ChannelFlags&lnwire.ChanUpdateDirection == 1 {
c2, c1 = c1, c2
}
// Order the edges by increasing pubkey.
if bytes.Compare(edgeInfo.NodeKey2Bytes[:],
edgeInfo.NodeKey1Bytes[:]) < 0 {
if c1 != nil && c1.ChannelFlags&lnwire.ChanUpdateDirection == 1 ||
c2 != nil && c2.ChannelFlags&lnwire.ChanUpdateDirection == 0 {
c2, c1 = c1, c2
}