T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an overflow check

Browse Source 
The check will be removed when rust-lang/rust#63326 is fixed
This commit is contained in:
Marcin Mielniczuk
2019-08-06 19:44:06 +02:00
committed by Jakub Konka
parent e731965fbb
commit 4c9be5909a
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/hostcalls_impl/fs.rs
View File

@@ -440,6 +440,7 @@ pub(crate) fn fd_allocate(
let current_size = metadata.len(); let current_size = metadata.len();
let wanted_size = offset.checked_add(len).ok_or(host::__WASI_E2BIG)?; let wanted_size = offset.checked_add(len).ok_or(host::__WASI_E2BIG)?;
// This check will be unnecessary when rust-lang/rust#63326 is fixed
if wanted_size > i64::max_value() as u64 { if wanted_size > i64::max_value() as u64 {
return Err(host::__WASI_E2BIG); return Err(host::__WASI_E2BIG);
} }
@@ -779,6 +780,10 @@ pub(crate) fn fd_filestat_set_size(
.and_then(|fe| fe.fd_object.descriptor.as_file())?; .and_then(|fe| fe.fd_object.descriptor.as_file())?;
let st_size = dec_filesize(st_size); let st_size = dec_filesize(st_size);
// This check will be unnecessary when rust-lang/rust#63326 is fixed
if st_size > i64::max_value() as u64 {
return Err(host::__WASI_E2BIG);
}
fd.set_len(st_size).map_err(errno_from_ioerror) fd.set_len(st_size).map_err(errno_from_ioerror)
} }