Merge #97: Don't .unwrap() on invalid proxies

danielabrozzoni · danielabrozzoni · commit 413c964e5c36 · 2023-02-27T09:18:05.000+01:00
3568b60 Don't `.unwrap()` on invalid proxies (Riccardo Mazzarini) Pull request description: ACKs for top commit: danielabrozzoni: utACK 3568b60 Tree-SHA512: c2ebb21d6e78616f34a8d3becb68551a857c7b391c46ff4d1e379e482a5a5d90a3c12807896fc4da99a7442b1911bf00f02db41ba0cb890bf0acd284b1e6e3e2
diff --git a/src/socks/v5.rs b/src/socks/v5.rs
@@ -198,7 +198,7 @@ impl Socks5Stream {
         U: ToTargetAddr,
     {
         let mut socket = if let Some(timeout) = timeout {
-            let addr = proxy.to_socket_addrs().unwrap().next().unwrap();
+            let addr = proxy.to_socket_addrs()?.next().unwrap();
             TcpStream::connect_timeout(&addr, timeout)?
         } else {
             TcpStream::connect(proxy)?

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ impl Socks5Stream {`
`198`	`198`	`U: ToTargetAddr,`
`199`	`199`	`{`
`200`	`200`	`let mut socket = if let Some(timeout) = timeout {`
`201`		`- let addr = proxy.to_socket_addrs().unwrap().next().unwrap();`
	`201`	`+ let addr = proxy.to_socket_addrs()?.next().unwrap();`
`202`	`202`	`TcpStream::connect_timeout(&addr, timeout)?`
`203`	`203`	`} else {`
`204`	`204`	`TcpStream::connect(proxy)?`