Fix boundary parsing actix#876

flappyBug · Jun 2, 2019 · 24180f9 · 24180f9
1 parent 15cdc68
commit 24180f9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/actix-multipart/CHANGES.md b/actix-multipart/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes
 
+## [0.1.2] - 2019-06-02
+
+* Fix boundary parsing #876
+
 ## [0.1.1] - 2019-05-25
 
 * Fix disconnect handling #834

diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-multipart"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Nikolay Kim <[email protected]>"]
 description = "Multipart support for actix web framework."
 readme = "README.md"
@@ -31,4 +31,4 @@ twoway = "0.2"
 
 [dev-dependencies]
 actix-rt = "0.2.2"
-actix-http = "0.2.0"
+actix-http = "0.2.2"
diff --git a/actix-multipart/src/server.rs b/actix-multipart/src/server.rs
@@ -537,8 +537,6 @@ impl InnerField {
                     if &payload.buf[b_len..b_size] == boundary.as_bytes() {
                         // found boundary
                         return Ok(Async::Ready(None));
-                    } else {
-                        pos = b_size;
                     }
                 }
             }
@@ -576,7 +574,7 @@ impl InnerField {
                     }
                 }
             } else {
-                return Ok(Async::Ready(Some(payload.buf.take().freeze())));
+                Ok(Async::Ready(Some(payload.buf.take().freeze())))
             };
         }
     }