From 0ae75634b1597c800cffcc51625ed536f3d8980b Mon Sep 17 00:00:00 2001
From: Lars Vahlenberg <lars.vahlenberg@gmail.com>
Date: Sat, 30 Jul 2022 16:28:43 +0200
Subject: [PATCH] SourceStream Position counting bug fix

---
 src/SharpCompress/IO/SourceStream.cs | 12 ++++++++++--
 src/SharpCompress/Utility.cs         |  2 --
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/SharpCompress/IO/SourceStream.cs b/src/SharpCompress/IO/SourceStream.cs
index 71918c81..e23f7eb7 100644
--- a/src/SharpCompress/IO/SourceStream.cs
+++ b/src/SharpCompress/IO/SourceStream.cs
@@ -143,9 +143,17 @@ namespace SharpCompress.IO
 
                 if (!IsVolumes && count != 0 && Current.Position == Current.Length)
                 {
-                    _prevSize += Current.Length;
-                    if (!SetStream(_stream + 1)) //will load next file if present
+                    var length = Current.Length;
+
+                    // Load next file if present
+                    if (!SetStream(_stream + 1)) 
+                    {
                         break;
+                    }
+
+                    // Current stream switched
+                    // Add length of previous stream
+                    _prevSize += length;
                     Current.Seek(0, SeekOrigin.Begin);
                 }
             }
diff --git a/src/SharpCompress/Utility.cs b/src/SharpCompress/Utility.cs
index 28979d9d..cbdb1ecb 100644
--- a/src/SharpCompress/Utility.cs
+++ b/src/SharpCompress/Utility.cs
@@ -170,10 +170,8 @@ namespace SharpCompress
             byte[] buffer = GetTransferByteArray();
             try
             {
-                var pos = source.Position;
                 int count = 0;
                 var len = source.Read(buffer, 0, buffer.Length);
-                source.Position = pos + len;
 
                 do
                 {