Do not swallow decoded read bytes in case of filter error

ntex-io/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.1.0-b.7] - 2021-12-27
+
+* Do not swallow decoded read bytes in case of filter error
+
 ## [0.1.0-b.6] - 2021-12-26
 
 * Rename `RecvError::StopDispatcher` to `RecvError::Stop`

ntex-io/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-io"
-version = "0.1.0-b.6"
+version = "0.1.0-b.7"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Utilities for encoding and decoding frames"
 keywords = ["network", "framework", "async", "futures"]

ntex-io/src/ioref.rs

@@ -82,7 +82,7 @@ impl IoRef {
     ///
     /// Dispatcher does not wait for uncompleted responses, but flushes io buffers.
     pub fn force_close(&self) {
-        log::trace!("force close framed object");
+        log::trace!("force close io stream object");
         self.0.insert_flags(Flags::DSP_STOP | Flags::IO_SHUTDOWN);
         self.0.read_task.wake();
         self.0.write_task.wake();

ntex-io/src/tasks.rs

@@ -37,7 +37,8 @@ impl ReadContext {
             Ok(())
         } else {
             let mut dst = self.0 .0.read_buf.take();
-            let nbytes = self.0.filter().release_read_buf(buf, &mut dst, nbytes)?;
+            let result = self.0.filter().release_read_buf(buf, &mut dst, nbytes);
+            let nbytes = result.as_ref().map(|i| *i).unwrap_or(0);
 
             if let Some(dst) = dst {
                 if self.0.flags().contains(Flags::IO_FILTERS) {
@@ -61,7 +62,14 @@ impl ReadContext {
                 self.0 .0.dispatch_task.wake();
                 self.0 .0.insert_flags(Flags::RD_READY);
             }
-            Ok(())
+
+            if let Err(err) = result {
+                self.0 .0.dispatch_task.wake();
+                self.0 .0.insert_flags(Flags::RD_READY);
+                Err(err)
+            } else {
+                Ok(())
+            }
         }
     }
 }