Merge pull request #188 from adamhathcock/fix_nulls

Fix null password on ReaderFactory. Fix null options on SevenZipArchive
adamhathcock · Oct 3, 2016 · 7efc701 · 7efc701
2 parents c73ac20 + d7e29f7
commit 7efc701
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs b/src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs
@@ -30,7 +30,7 @@ public static SevenZipArchive Open(string filePath, ReaderOptions readerOptions
         /// </summary>
         /// <param name="fileInfo"></param>
         /// <param name="readerOptions"></param>
-        public static SevenZipArchive Open(FileInfo fileInfo, ReaderOptions readerOptions)
+        public static SevenZipArchive Open(FileInfo fileInfo, ReaderOptions readerOptions = null)
         {
             fileInfo.CheckNotNull("fileInfo");
             return new SevenZipArchive(fileInfo, readerOptions ?? new ReaderOptions());
@@ -44,7 +44,7 @@ public static SevenZipArchive Open(FileInfo fileInfo, ReaderOptions readerOption
         public static SevenZipArchive Open(Stream stream, ReaderOptions readerOptions = null)
         {
             stream.CheckNotNull("stream");
-            return new SevenZipArchive(stream, readerOptions);
+            return new SevenZipArchive(stream, readerOptions ?? new ReaderOptions());
         }
 
 #if !NO_FILE

diff --git a/src/SharpCompress/Common/Volume.cs b/src/SharpCompress/Common/Volume.cs
@@ -8,10 +8,10 @@ public abstract class Volume : IVolume
     {
         private readonly Stream actualStream;
 
-        internal Volume(Stream stream, ReaderOptions readerFactoryOptions)
+        internal Volume(Stream stream, ReaderOptions readerOptions)
         {
             actualStream = stream;
-            ReaderOptions = readerFactoryOptions;
+            ReaderOptions = readerOptions;
         }
 
         internal Stream Stream { get { return new NonDisposingStream(actualStream); } }

diff --git a/src/SharpCompress/Readers/AbstractReader.cs b/src/SharpCompress/Readers/AbstractReader.cs
@@ -29,7 +29,7 @@ internal AbstractReader(ReaderOptions options, ArchiveType archiveType)
             Options = options;
         }
 
-        internal ReaderOptions Options { get; private set; }
+        internal ReaderOptions Options { get; }
 
         public ArchiveType ArchiveType { get; }
 

diff --git a/src/SharpCompress/Readers/ReaderFactory.cs b/src/SharpCompress/Readers/ReaderFactory.cs
@@ -33,7 +33,7 @@ public static IReader Open(Stream stream, ReaderOptions options = null)
                                  };
             RewindableStream rewindableStream = new RewindableStream(stream);
             rewindableStream.StartRecording();
-            if (ZipArchive.IsZipFile(rewindableStream, null))
+            if (ZipArchive.IsZipFile(rewindableStream, options.Password))
             {
                 rewindableStream.Rewind(true);
                 return ZipReader.Open(rewindableStream, options);

diff --git a/test/SharpCompress.Test/Zip/ZipReaderTests.cs b/test/SharpCompress.Test/Zip/ZipReaderTests.cs
@@ -228,6 +228,8 @@ public override bool CanSeek
         [Fact]
         public void TestSharpCompressWithEmptyStream()
         {
+            ResetScratch();
+
             MemoryStream stream = new NonSeekableMemoryStream();
 
             using (IWriter zipWriter = WriterFactory.Open(stream, ArchiveType.Zip, CompressionType.Deflate))
@@ -250,7 +252,9 @@ public void TestSharpCompressWithEmptyStream()
                         byte[] buf = new byte[bufSize];
                         int bytesRead = 0;
                         while ((bytesRead = entry.Read(buf, 0, bufSize)) > 0)
+                        {
                             tempStream.Write(buf, 0, bytesRead);
+                        }
                     }
                 }
             }