From 767dd91b7ea692291d8d20cd03900648dd6e1c31 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Mon, 31 Jan 2022 15:17:16 +0600
Subject: [PATCH] Fix conversion from BytesVec to BytesMut and back
 (BytesVec::with_bytes_mut())

---
 ntex-bytes/CHANGELOG.md        | 4 ++++
 ntex-bytes/Cargo.toml          | 2 +-
 ntex-bytes/src/bytes.rs        | 8 +++++---
 ntex-bytes/tests/test_bytes.rs | 1 +
 ntex-codec/Cargo.toml          | 2 +-
 ntex/Cargo.toml                | 2 +-
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ntex-bytes/CHANGELOG.md b/ntex-bytes/CHANGELOG.md
index cf2786b5..a46b809e 100644
--- a/ntex-bytes/CHANGELOG.md
+++ b/ntex-bytes/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changes
 
+## [0.1.11] (2022-01-31)
+
+* Fix conversion from BytesVec to BytesMut and back (BytesVec::with_bytes_mut())
+
 ## [0.1.11] (2022-01-30)
 
 * Add BytesVec type
diff --git a/ntex-bytes/Cargo.toml b/ntex-bytes/Cargo.toml
index d93d2082..c3e11dd8 100644
--- a/ntex-bytes/Cargo.toml
+++ b/ntex-bytes/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ntex-bytes"
-version = "0.1.11"
+version = "0.1.12"
 license = "MIT"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Carl Lerche <me@carllerche.com>"]
 description = "Types and traits for working with bytes (bytes crate fork)"
diff --git a/ntex-bytes/src/bytes.rs b/ntex-bytes/src/bytes.rs
index efb741ea..e3cc8aba 100644
--- a/ntex-bytes/src/bytes.rs
+++ b/ntex-bytes/src/bytes.rs
@@ -2730,7 +2730,9 @@ impl InnerVec {
                     )
                 } else if kind == KIND_VEC {
                     let ptr = buf.inner.shared_vec();
-                    let offset = buf.inner.arc.as_ptr() as usize - ptr as usize;
+                    let offset = buf.inner.ptr as usize - ptr as usize;
+
+                    // we cannot use shared vec if BytesMut points to inside of vec
                     if buf.inner.cap < (*ptr).cap - offset {
                         InnerVec::from_slice(
                             buf.inner.capacity(),
@@ -2738,11 +2740,11 @@ impl InnerVec {
                             buf.inner.pool(),
                         )
                     } else {
+                        // BytesMut owns rest of the vec, so re-use
                         (*ptr).len = buf.len() as u32;
                         (*ptr).offset = offset as u32;
                         let inner = InnerVec(NonNull::new_unchecked(ptr));
-                        // reuse bytes
-                        mem::forget(buf);
+                        mem::forget(buf); // reuse bytes
                         inner
                     }
                 } else {
diff --git a/ntex-bytes/tests/test_bytes.rs b/ntex-bytes/tests/test_bytes.rs
index 5c6fca83..a77066e5 100644
--- a/ntex-bytes/tests/test_bytes.rs
+++ b/ntex-bytes/tests/test_bytes.rs
@@ -824,6 +824,7 @@ fn bytes_vec_freeze() {
 fn bytes_vec() {
     let mut bytes = BytesVec::copy_from_slice(LONG);
     bytes.with_bytes_mut(|buf| {
+        assert_eq!(buf, LONG);
         assert_eq!(buf.split_to(4), &LONG[..4]);
     });
     assert_eq!(bytes, &LONG[4..]);
diff --git a/ntex-codec/Cargo.toml b/ntex-codec/Cargo.toml
index 0e18157c..d5a53e44 100644
--- a/ntex-codec/Cargo.toml
+++ b/ntex-codec/Cargo.toml
@@ -16,4 +16,4 @@ name = "ntex_codec"
 path = "src/lib.rs"
 
 [dependencies]
-ntex-bytes = "0.1.11"
+ntex-bytes = "0.1.12"
diff --git a/ntex/Cargo.toml b/ntex/Cargo.toml
index 102956ed..4e46c750 100644
--- a/ntex/Cargo.toml
+++ b/ntex/Cargo.toml
@@ -53,7 +53,7 @@ ntex-router = "0.5.1"
 ntex-service = "0.3.1"
 ntex-macros = "0.1.3"
 ntex-util = "0.1.13"
-ntex-bytes = "0.1.11"
+ntex-bytes = "0.1.12"
 ntex-tls = "0.1.3"
 ntex-rt = "0.4.3"
 ntex-io = "0.1.7"