From 02fa54ff3ce75856862177f588b937f082a74bad Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 22 May 2019 07:44:51 +0200
Subject: [PATCH] src/backup/chunk_stream.rs: assemble data with correct order

---
 src/backup/chunk_stream.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/backup/chunk_stream.rs b/src/backup/chunk_stream.rs
index e21224dc..e8180a75 100644
--- a/src/backup/chunk_stream.rs
+++ b/src/backup/chunk_stream.rs
@@ -43,9 +43,14 @@ impl <S: Stream<Item=Vec<u8>, Error=Error>> Stream for ChunkStream<S> {
                         return Ok(Async::Ready(None));
                     }
                 }
-                Ok(Async::Ready(Some(mut data))) => {
+                Ok(Async::Ready(Some(data))) => {
 
-                    if let Some(rest) = self.rest.take() { data.extend(rest); }
+                    let data = if let Some(mut rest) = self.rest.take() {
+                        rest.extend(data);
+                        rest
+                    } else {
+                        data
+                    };
 
                     let buffer = self.buffer.get_or_insert_with(|| Vec::with_capacity(1024*1024));
                     let boundary = self.chunker.scan(&data);