From ca81d5379c81a8612f3d562dbb183dcc97dc9939 Mon Sep 17 00:00:00 2001
From: Peter Huene <peter@huene.dev>
Date: Thu, 28 Jan 2021 14:32:27 -0800
Subject: [PATCH] Stop allowing bufused > BUF_LEN in fd_readdir program.

This commit removes what appears to be a workaround to the bug being fixed by
the change in #2620.
---
 crates/test-programs/wasi-tests/src/bin/fd_readdir.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/test-programs/wasi-tests/src/bin/fd_readdir.rs b/crates/test-programs/wasi-tests/src/bin/fd_readdir.rs
index 903329b7443c..df021c8fd970 100644
--- a/crates/test-programs/wasi-tests/src/bin/fd_readdir.rs
+++ b/crates/test-programs/wasi-tests/src/bin/fd_readdir.rs
@@ -59,7 +59,9 @@ unsafe fn exec_fd_readdir(fd: wasi::Fd, cookie: wasi::Dircookie) -> (Vec<DirEntr
     let bufused =
         wasi::fd_readdir(fd, buf.as_mut_ptr(), BUF_LEN, cookie).expect("failed fd_readdir");
 
-    let sl = slice::from_raw_parts(buf.as_ptr(), min(BUF_LEN, bufused));
+    assert!(bufused <= BUF_LEN);
+
+    let sl = slice::from_raw_parts(buf.as_ptr(), bufused);
     let dirs: Vec<_> = ReadDir::from_slice(sl).collect();
     let eof = bufused < BUF_LEN;
     (dirs, eof)