diff options
| author | bors <bors@rust-lang.org> | 2016-09-08 22:30:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-08 22:30:12 -0700 |
| commit | 5440a1fae7da4309f8fd85420a8b6596a662c121 (patch) | |
| tree | b63808dabfa65c14212e860a0325b2f2bec81a9b /src/libstd/sys | |
| parent | 1df64450ecf9d2c458b5789ef823203fcdbd60a9 (diff) | |
| parent | 3f0462acbbabc7703dffdd2771d6cca56eb5545b (diff) | |
| download | rust-5440a1fae7da4309f8fd85420a8b6596a662c121.tar.gz rust-5440a1fae7da4309f8fd85420a8b6596a662c121.zip | |
Auto merge of #36322 - uweigand:nonblocking, r=alexcrichton
Fix argument to FIONBIO ioctl The FIONBIO ioctl takes as argument a pointer to an integer, which should be either 0 or 1 to indicate whether nonblocking mode is to be switched off or on. The type of the pointed-to variable is "int". However, the set_nonblocking routine in libstd/sys/unix/net.rs passes a pointer to a libc::c_ulong variable. This doesn't matter on all 32-bit platforms and on all litte-endian platforms, but it will break on big-endian 64-bit platforms. Found while porting Rust to s390x (a big-endian 64-bit platform). Signed-off-by: Ulrich Weigand <ulrich.weigand@de.ibm.com>
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/net.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/net.rs b/src/libstd/sys/unix/net.rs index 3f77abd7f44..f124ea651ec 100644 --- a/src/libstd/sys/unix/net.rs +++ b/src/libstd/sys/unix/net.rs @@ -213,7 +213,7 @@ impl Socket { } pub fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()> { - let mut nonblocking = nonblocking as libc::c_ulong; + let mut nonblocking = nonblocking as libc::c_int; cvt(unsafe { libc::ioctl(*self.as_inner(), libc::FIONBIO, &mut nonblocking) }).map(|_| ()) } |