Merge branch 'master' into master

adamhathcock · Aug 26, 2022 · 6e4f54e · 6e4f54e
2 parents 9458ea8 + 4ba2963
commit 6e4f54e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/src/SharpCompress/Compressors/LZMA/ICoder.cs b/src/SharpCompress/Compressors/LZMA/ICoder.cs
@@ -25,7 +25,7 @@ public InvalidParamException()
         }
     }
 
-    internal interface ICodeProgress
+    public interface ICodeProgress
     {
         /// <summary>
         /// Callback progress.
@@ -169,4 +169,4 @@ internal interface ISetDecoderProperties
     {
         void SetDecoderProperties(byte[] properties);
     }
-}
+}
diff --git a/src/SharpCompress/Compressors/LZMA/LzmaDecoder.cs b/src/SharpCompress/Compressors/LZMA/LzmaDecoder.cs
@@ -7,7 +7,7 @@
 
 namespace SharpCompress.Compressors.LZMA
 {
-    internal class Decoder : ICoder, ISetDecoderProperties // ,System.IO.Stream
+    public class Decoder : ICoder, ISetDecoderProperties // ,System.IO.Stream
     {
         private class LenDecoder
         {

diff --git a/src/SharpCompress/IO/SourceStream.cs b/src/SharpCompress/IO/SourceStream.cs
@@ -143,9 +143,17 @@ public override int Read(byte[] buffer, int offset, int count)
 
                 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
@@ -170,10 +170,8 @@ public static bool Find(this Stream source, byte[] array)
             byte[] buffer = GetTransferByteArray();
             try
             {
-                var pos = source.Position;
                 int count = 0;
                 var len = source.Read(buffer, 0, buffer.Length);
-                source.Position = pos + len;
 
                 do
                 {