Merge pull request tomap#13 from squid-box/tomapGH-12

Potential fix for tomap#12
arttarasov · Jul 27, 2018 · ed45736 · ed45736
2 parents 7e4df6e + baeca6b
commit ed45736
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/SevenZip/ArchiveOpenCallback.cs b/SevenZip/ArchiveOpenCallback.cs
@@ -80,6 +80,12 @@ public ArchiveOpenCallback(string fileName, string password) : base(password)
 
         public int GetProperty(ItemPropId propId, ref PropVariant value)
         {
+            if (_fileInfo == null)
+            {
+                // We are likely opening an archive from a Stream, and no file or _fileInfo exists.
+                return 0;
+            }
+
             switch (propId)
             {
                 case ItemPropId.Name:
@@ -111,6 +117,7 @@ public int GetProperty(ItemPropId propId, ref PropVariant value)
                     value.Int64Value = _fileInfo.LastWriteTime.ToFileTime();
                     break;
             }
+
             return 0;
         }
 

diff --git a/SevenZipTests/SevenZipExtractorTests.cs b/SevenZipTests/SevenZipExtractorTests.cs
@@ -94,10 +94,11 @@ public void ExtractionWithCancellationTest()
         [Test]
         public void ExtractionFromStreamTest()
         {
+            // TODO: Rewrite this to test against more/all TestData archives.
+
             using (var tmp = new SevenZipExtractor(File.OpenRead(@"TestData\multiple_files.7z")))
             {
                 tmp.ExtractArchive(OutputDirectory);
-
                 Assert.AreEqual(3, Directory.GetFiles(OutputDirectory).Length);
             }
         }