Merge pull request #20 from icarus-consulting/i19-zippaths-crash

I19 zippaths crash

Author: koeeenig

src/Yaapii.Zip/ZipPaths.cs

@@ -32,15 +32,18 @@ public ZipPaths(IInput input, bool leaveOpen = true)
                         inputStream.Seek(0, SeekOrigin.Begin);
                         inputStream.Flush();
                         IEnumerable<string> files = new EnumerableOf<string>();
-                        using (var zip = new ZipArchive(inputStream, ZipArchiveMode.Read, leaveOpen))
+                        if(inputStream.Length > 0)
                         {
-                            if (zip.Entries.Count > 0)
+                            using (var zip = new ZipArchive(inputStream, ZipArchiveMode.Read, leaveOpen))
                             {
-                                files =
-                                    new Mapped<ZipArchiveEntry, string>(entry =>
-                                        entry.FullName,
-                                        zip.Entries
-                                    );
+                                if (zip.Entries.Count > 0)
+                                {
+                                    files =
+                                        new Mapped<ZipArchiveEntry, string>(entry =>
+                                            entry.FullName,
+                                            zip.Entries
+                                        );
+                                }
                             }
                         }
                         inputStream.Seek(0, SeekOrigin.Begin);

src/Yaapii.Zip/ZipUpdated.cs

@@ -34,16 +34,16 @@ public ZipUpdated(IScalar<Stream> zip, string pathToUpdate, IInput update, bool
         {
             this.zip = new Solid<Stream>(() =>
             {
-                new FailWhen(
-                    () => ExistsAndCrypted(new InputOf(zip.Value()), pathToUpdate),
-                    new InvalidOperationException(
-                        $"Cannot update '{pathToUpdate}' because the file is password protected"
-                    )
-                ).Go();
-
-                lock (zip.Value())
+                var stream = zip.Value();
+                lock (stream)
                 {
-                    var stream = zip.Value();
+                    new FailWhen(
+                        () => ExistsAndCrypted(new InputOf(stream), pathToUpdate),
+                        new InvalidOperationException(
+                            $"Cannot update '{pathToUpdate}' because the file is password protected"
+                        )
+                    ).Go();
+                    
                     stream.Seek(0, SeekOrigin.Begin);
                     using (var archive = new ZipArchive(stream, ZipArchiveMode.Update, leaveOpen))
                     {

tests/Test.Yaapii.Zip/ZipPathsTests.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.IO;
+using System.Threading.Tasks;
 using Xunit;
 using Yaapii.Atoms.IO;
 
@@ -96,5 +97,17 @@ public void ListsAllPathsFromWindowsZip()
                 ).Value()
             );
         }
+
+        [Fact]
+        public void EmptyFilesOnEmptyStream()
+        {
+            Assert.Empty(
+                new ZipPaths(
+                    new InputOf(
+                        new MemoryStream()
+                    )
+                )
+            );
+        }
     }
 }