Skip to content

Commit

Permalink
addrinfo hint in lookup_host() needs clean initialization on all plat…
Browse files Browse the repository at this point in the history
…forms

Fixes #43649
  • Loading branch information
Danek Duvall committed Aug 7, 2017
1 parent ed16b0a commit 378a618
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/liblibc
Submodule liblibc updated 56 files
+5 −5 Cargo.lock
+5 −1 Cargo.toml
+6 −0 appveyor.yml
+1 −1 ci/docker/aarch64-unknown-linux-gnu/Dockerfile
+1 −1 ci/docker/arm-unknown-linux-gnueabihf/Dockerfile
+1 −1 ci/docker/i686-unknown-linux-gnu/Dockerfile
+1 −1 ci/docker/i686-unknown-linux-musl/Dockerfile
+1 −1 ci/docker/mips-unknown-linux-gnu/Dockerfile
+1 −1 ci/docker/mips-unknown-linux-musl/Dockerfile
+1 −1 ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile
+1 −1 ci/docker/mipsel-unknown-linux-musl/Dockerfile
+1 −1 ci/docker/powerpc-unknown-linux-gnu/Dockerfile
+1 −1 ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
+1 −1 ci/docker/s390x-unknown-linux-gnu/Dockerfile
+1 −1 ci/docker/x86_64-unknown-linux-gnu/Dockerfile
+1 −1 ci/docker/x86_64-unknown-linux-musl/Dockerfile
+23 −3 libc-test/build.rs
+1 −0 src/unix/bsd/apple/b32.rs
+1 −0 src/unix/bsd/apple/b64.rs
+81 −0 src/unix/bsd/apple/mod.rs
+1 −0 src/unix/bsd/freebsdlike/dragonfly/mod.rs
+2 −0 src/unix/bsd/freebsdlike/freebsd/mod.rs
+6 −0 src/unix/bsd/freebsdlike/mod.rs
+5 −0 src/unix/bsd/netbsdlike/openbsdlike/mod.rs
+8 −0 src/unix/mod.rs
+0 −5 src/unix/newlib/mod.rs
+3 −0 src/unix/notbsd/android/b32/arm.rs
+0 −1 src/unix/notbsd/android/b32/mod.rs
+407 −0 src/unix/notbsd/android/b32/x86.rs
+1 −0 src/unix/notbsd/android/b64/aarch64.rs
+367 −2 src/unix/notbsd/android/b64/x86_64.rs
+26 −1 src/unix/notbsd/android/mod.rs
+2 −0 src/unix/notbsd/linux/mips/mips32.rs
+2 −0 src/unix/notbsd/linux/mips/mips64.rs
+2 −0 src/unix/notbsd/linux/mips/mod.rs
+7 −0 src/unix/notbsd/linux/mod.rs
+1 −0 src/unix/notbsd/linux/musl/b32/arm.rs
+1 −0 src/unix/notbsd/linux/musl/b32/mips.rs
+400 −3 src/unix/notbsd/linux/musl/b32/x86.rs
+1 −0 src/unix/notbsd/linux/musl/b64/mod.rs
+360 −1 src/unix/notbsd/linux/musl/b64/x86_64.rs
+1 −14 src/unix/notbsd/linux/musl/mod.rs
+2 −0 src/unix/notbsd/linux/other/b32/arm.rs
+2 −0 src/unix/notbsd/linux/other/b32/mod.rs
+1 −0 src/unix/notbsd/linux/other/b32/powerpc.rs
+399 −379 src/unix/notbsd/linux/other/b32/x86.rs
+2 −0 src/unix/notbsd/linux/other/b64/aarch64.rs
+2 −0 src/unix/notbsd/linux/other/b64/mod.rs
+2 −0 src/unix/notbsd/linux/other/b64/powerpc64.rs
+2 −0 src/unix/notbsd/linux/other/b64/sparc64.rs
+363 −342 src/unix/notbsd/linux/other/b64/x86_64.rs
+0 −3 src/unix/notbsd/linux/other/mod.rs
+4 −4 src/unix/notbsd/linux/s390x.rs
+24 −0 src/unix/notbsd/mod.rs
+3 −1 src/unix/solaris/mod.rs
+3 −0 src/unix/uclibc/mod.rs
12 changes: 2 additions & 10 deletions src/libstd/sys_common/net.rs
Expand Up @@ -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)) {
Expand Down

0 comments on commit 378a618

Please sign in to comment.