From 378a6188640f4e0fb2cc075d6f6062d53aadbb7a Mon Sep 17 00:00:00 2001
From: Danek Duvall <danek.duvall@oracle.com>
Date: Sun, 6 Aug 2017 20:12:53 -0700
Subject: [PATCH] addrinfo hint in lookup_host() needs clean initialization on
all platforms
Fixes #43649
---
src/liblibc | 2 +-
src/libstd/sys_common/net.rs | 12 ++----------
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/liblibc b/src/liblibc
index ec1e5ab1ef8ba..2a5b50b7f7f53 160000
--- a/src/liblibc
+++ b/src/liblibc
@@ -1 +1 @@
-Subproject commit ec1e5ab1ef8baca57f8776bbebd9343572a87082
+Subproject commit 2a5b50b7f7f539a0fd201331d6c1e0534aa332f5
diff --git a/src/libstd/sys_common/net.rs b/src/libstd/sys_common/net.rs
index 5775dd4f1fcd4..1ca39ff9d4a1c 100644
--- a/src/libstd/sys_common/net.rs
+++ b/src/libstd/sys_common/net.rs
@@ -165,16 +165,8 @@ pub fn lookup_host(host: &str) -> io::Result<LookupHost> {
init();
let c_host = CString::new(host)?;
- let hints = c::addrinfo {
- ai_flags: 0,
- ai_family: 0,
- ai_socktype: c::SOCK_STREAM,
- ai_protocol: 0,
- ai_addrlen: 0,
- ai_addr: ptr::null_mut(),
- ai_canonname: ptr::null_mut(),
- ai_next: ptr::null_mut()
- };
+ let mut hints: c::addrinfo = unsafe { mem::zeroed() };
+ hints.ai_socktype = c::SOCK_STREAM;
let mut res = ptr::null_mut();
unsafe {
match cvt_gai(c::getaddrinfo(c_host.as_ptr(), ptr::null(), &hints, &mut res)) {