Skip to content

Commit d909cde

Browse files
authored
Merge pull request from GHSA-pr39-8257-fxc2
fix: fix multiaddr convert to socket unwrap
2 parents c4ccdc8 + ecaedd3 commit d909cde

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

network/src/protocols/discovery/substream.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ impl SubstreamValue {
141141
count: MAX_ADDR_TO_SEND as u32,
142142
listen_port: substream.listen_port,
143143
});
144-
addr_known.insert(RawAddr::from(
145-
multiaddr_to_socketaddr(&substream.remote_addr).unwrap(),
146-
));
144+
if let Some(addr) = multiaddr_to_socketaddr(&substream.remote_addr) {
145+
addr_known.insert(RawAddr::from(addr));
146+
}
147147

148148
RemoteAddress::Listen(substream.remote_addr)
149149
} else {
@@ -389,7 +389,11 @@ impl Substream {
389389
context
390390
.listens()
391391
.iter()
392-
.map(|address| multiaddr_to_socketaddr(address).unwrap().port())
392+
.map(|address| {
393+
multiaddr_to_socketaddr(address)
394+
.map(|addr| addr.port())
395+
.unwrap_or_default()
396+
})
393397
.next()
394398
} else {
395399
None

0 commit comments

Comments
 (0)