A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Fix a missing outparam write in the p1 adapter (#11702)
Alex Crichton3cc0023cb602
diff --git a/crates/test-programs/src/bin/preview1_fd_readdir.rs b/crates/test-programs/src/bin/preview1_fd_readdir.rsindex b5a04e3b3d..1fdb63cc08 100644--- a/crates/test-programs/src/bin/preview1_fd_readdir.rs+++ b/crates/test-programs/src/bin/preview1_fd_readdir.rs@@ -241,6 +241,34 @@ unsafe fn test_fd_readdir_unicode_boundary(dir_fd: wasip1::Fd) {wasip1::path_unlink_file(dir_fd, filename).expect("removing a file");}+unsafe fn test_fd_readdir_past_end(dir_fd: wasip1::Fd) {+ let file_fd = wasip1::path_open(+ dir_fd,+ 0,+ "a",+ wasip1::OFLAGS_CREAT,+ wasip1::RIGHTS_FD_READ | wasip1::RIGHTS_FD_WRITE,+ 0,+ 0,+ )+ .expect("failed to create file");+ wasip1::fd_close(file_fd).expect("closing a file");++ let mut buf = vec![0; 128];+ let len = wasip1::fd_readdir(dir_fd, buf.as_mut_ptr(), buf.capacity(), 0).unwrap();++ let next = ReadDir::from_slice(&buf[..len])+ .last()+ .unwrap()+ .dirent+ .d_next;++ let len = wasip1::fd_readdir(dir_fd, buf.as_mut_ptr(), buf.capacity(), next + 1).unwrap();+ assert_eq!(len, 0);++ wasip1::path_unlink_file(dir_fd, "a").expect("removing a file");+}+fn main() {let mut args = env::args();let prog = args.next().unwrap();@@ -264,4 +292,5 @@ fn main() {unsafe { test_fd_readdir(dir_fd) }unsafe { test_fd_readdir_lots(dir_fd) }unsafe { test_fd_readdir_unicode_boundary(dir_fd) }+ unsafe { test_fd_readdir_past_end(dir_fd) }}diff --git a/crates/wasi-preview1-component-adapter/src/lib.rs b/crates/wasi-preview1-component-adapter/src/lib.rsindex 79bd515d7c..d744c0d659 100644--- a/crates/wasi-preview1-component-adapter/src/lib.rs+++ b/crates/wasi-preview1-component-adapter/src/lib.rs@@ -1406,7 +1406,10 @@ pub unsafe extern "C" fn fd_readdir(match iter.next() {Some(Ok(_)) => {}Some(Err(e)) => return Err(e),- None => return Ok(()),+ None => {+ *bufused = 0;+ return Ok(());+ }}}}