From a2dd66815db4c7eb218b719d875cd8e1623cc1a7 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Wed, 12 Jan 2022 22:09:49 +0600
Subject: [PATCH] Fix potential BorrowMutError

---
 ntex-tokio/CHANGES.md |  4 ++++
 ntex-tokio/Cargo.toml |  6 +++---
 ntex-tokio/src/io.rs  | 14 ++++++++++----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ntex-tokio/CHANGES.md b/ntex-tokio/CHANGES.md
index ac153b8b..c00d391e 100644
--- a/ntex-tokio/CHANGES.md
+++ b/ntex-tokio/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes
 
+## [0.1.2] - 2022-01-12
+
+* Fix potential BorrowMutError
+
 ## [0.1.1] - 2022-01-10
 
 * Allow to set socket options
diff --git a/ntex-tokio/Cargo.toml b/ntex-tokio/Cargo.toml
index 735d0b5d..440080aa 100644
--- a/ntex-tokio/Cargo.toml
+++ b/ntex-tokio/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ntex-tokio"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "tokio intergration for ntex framework"
 keywords = ["network", "framework", "async", "futures"]
@@ -17,8 +17,8 @@ path = "src/lib.rs"
 
 [dependencies]
 ntex-bytes = "0.1.9"
-ntex-io = "0.1.2"
-ntex-util = "0.1.8"
+ntex-io = "0.1.3"
+ntex-util = "0.1.9"
 log = "0.4"
 pin-project-lite = "0.2"
 tokio = { version = "1", default-features = false, features = ["rt", "net", "sync", "signal"] }
diff --git a/ntex-tokio/src/io.rs b/ntex-tokio/src/io.rs
index ca726017..bf068bdf 100644
--- a/ntex-tokio/src/io.rs
+++ b/ntex-tokio/src/io.rs
@@ -92,6 +92,7 @@ impl Future for ReadTask {
                             }
                             Poll::Ready(Err(err)) => {
                                 log::trace!("read task failed on io {:?}", err);
+                                drop(io);
                                 let _ = this.state.release_read_buf(buf, new_bytes);
                                 this.state.close(Some(err));
                                 return Poll::Ready(());
@@ -99,6 +100,7 @@ impl Future for ReadTask {
                         }
                     }
 
+                    drop(io);
                     if new_bytes == 0 && close {
                         this.state.close(None);
                         return Poll::Ready(());
@@ -258,10 +260,11 @@ impl Future for WriteTask {
                         Shutdown::Stopping(ref mut count) => {
                             // read until 0 or err
                             let mut buf = [0u8; 512];
-                            let mut io = this.io.borrow_mut();
                             loop {
                                 let mut read_buf = ReadBuf::new(&mut buf);
-                                match Pin::new(&mut *io).poll_read(cx, &mut read_buf) {
+                                match Pin::new(&mut *this.io.borrow_mut())
+                                    .poll_read(cx, &mut read_buf)
+                                {
                                     Poll::Ready(Err(_)) | Poll::Ready(Ok(_))
                                         if read_buf.filled().is_empty() =>
                                     {
@@ -536,6 +539,7 @@ mod unixstream {
                                 }
                                 Poll::Ready(Err(err)) => {
                                     log::trace!("read task failed on io {:?}", err);
+                                    drop(io);
                                     let _ = this.state.release_read_buf(buf, new_bytes);
                                     this.state.close(Some(err));
                                     return Poll::Ready(());
@@ -543,6 +547,7 @@ mod unixstream {
                             }
                         }
 
+                        drop(io);
                         if new_bytes == 0 && close {
                             this.state.close(None);
                             return Poll::Ready(());
@@ -682,10 +687,11 @@ mod unixstream {
                             Shutdown::Stopping(ref mut count) => {
                                 // read until 0 or err
                                 let mut buf = [0u8; 512];
-                                let mut io = this.io.borrow_mut();
                                 loop {
                                     let mut read_buf = ReadBuf::new(&mut buf);
-                                    match Pin::new(&mut *io).poll_read(cx, &mut read_buf) {
+                                    match Pin::new(&mut *this.io.borrow_mut())
+                                        .poll_read(cx, &mut read_buf)
+                                    {
                                         Poll::Ready(Err(_)) | Poll::Ready(Ok(_))
                                             if read_buf.filled().is_empty() =>
                                         {