Skip to content

Commit

Permalink
Do not silently truncate offsets for read_at/write_at on emscripten
Browse files Browse the repository at this point in the history
Generate an IO error if the offset is out of bounds for the system call.
  • Loading branch information
tbu- authored and Mark-Simulacrum committed May 12, 2018
1 parent bf6804b commit 5d015e1
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions src/libstd/sys/unix/fd.rs
Expand Up @@ -75,8 +75,15 @@ impl FileDesc {
unsafe fn cvt_pread64(fd: c_int, buf: *mut c_void, count: usize, offset: i64)
-> io::Result<isize>
{
use convert::TryInto;
use libc::pread64;
cvt(pread64(fd, buf, count, offset as i32))
// pread64 on emscripten actually takes a 32 bit offset
if let Ok(o) = offset.try_into() {
cvt(pread64(fd, buf, count, o))
} else {
Err(io::Error::new(io::ErrorKind::InvalidInput,
"cannot pread >2GB"))
}
}

#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
Expand Down Expand Up @@ -116,8 +123,15 @@ impl FileDesc {
unsafe fn cvt_pwrite64(fd: c_int, buf: *const c_void, count: usize, offset: i64)
-> io::Result<isize>
{
use convert::TryInto;
use libc::pwrite64;
cvt(pwrite64(fd, buf, count, offset as i32))
// pwrite64 on emscripten actually takes a 32 bit offset
if let Ok(o) = offset.try_into() {
cvt(pwrite64(fd, buf, count, o))
} else {
Err(io::Error::new(io::ErrorKind::InvalidInput,
"cannot pwrite >2GB"))
}
}

#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
Expand Down

0 comments on commit 5d015e1

Please sign in to comment.