fix(driver): when len is 0, should use buffer cap

compio-rs · Jul 11, 2024 · 5fa51af · 5fa51af
1 parent bcb531f
commit 5fa51af
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/compio-driver/src/iocp/op.rs b/compio-driver/src/iocp/op.rs
@@ -190,9 +190,14 @@ impl<S> ReadAtBufferPool<S> {
         let buffer = buffer_pool.get_buffer().ok_or_else(|| {
             io::Error::new(ErrorKind::Other, "buffer ring has no available buffer")
         })?;
+        let len = if len == 0 {
+            buffer.capacity()
+        } else {
+            buffer.capacity().min(len as _)
+        };
 
         Ok(Self {
-            read_at: ReadAt::new(fd, offset, buffer.slice(..len as usize)),
+            read_at: ReadAt::new(fd, offset, buffer.slice(..len)),
         })
     }
 }
@@ -498,9 +503,14 @@ impl<S> RecvBufferPool<S> {
         let buffer = buffer_pool.get_buffer().ok_or_else(|| {
             io::Error::new(ErrorKind::Other, "buffer ring has no available buffer")
         })?;
+        let len = if len == 0 {
+            buffer.capacity()
+        } else {
+            buffer.capacity().min(len as _)
+        };
 
         Ok(Self {
-            recv: Recv::new(fd, buffer.slice(..len as usize)),
+            recv: Recv::new(fd, buffer.slice(..len)),
         })
     }
 }

diff --git a/compio-driver/src/poll/op.rs b/compio-driver/src/poll/op.rs
@@ -218,9 +218,14 @@ impl<S> ReadAtBufferPool<S> {
         let buffer = buffer_pool.get_buffer().ok_or_else(|| {
             io::Error::new(ErrorKind::Other, "buffer ring has no available buffer")
         })?;
+        let len = if len == 0 {
+            buffer.capacity()
+        } else {
+            buffer.capacity().min(len as _)
+        };
 
         Ok(Self {
-            read_at: ReadAt::new(fd, offset, buffer.slice(..len as usize)),
+            read_at: ReadAt::new(fd, offset, buffer.slice(..len)),
         })
     }
 }
@@ -530,9 +535,14 @@ impl<S> RecvBufferPool<S> {
         let buffer = buffer_pool.get_buffer().ok_or_else(|| {
             io::Error::new(ErrorKind::Other, "buffer ring has no available buffer")
         })?;
+        let len = if len == 0 {
+            buffer.capacity()
+        } else {
+            buffer.capacity().min(len as _)
+        };
 
         Ok(Self {
-            recv: Recv::new(fd, buffer.slice(..len as usize)),
+            recv: Recv::new(fd, buffer.slice(..len)),
         })
     }
 }