Fixed issue when appending encrypted files to a stream.

squid-box · Mar 22, 2023 · 2fa34a7 · 2fa34a7
1 parent fccecd6
commit 2fa34a7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/SevenZip.Tests/SevenZipCompressorTests.cs b/SevenZip.Tests/SevenZipCompressorTests.cs
@@ -377,5 +377,28 @@ public void AppendToArchiveWithEncryptedHeadersTest()
 
             compressor.CompressFilesEncrypted(TemporaryFile, "password", @"TestData\zip.zip");
         }
+
+        [Test]
+        public void AppendEncryptedFileToStreamTest()
+        {
+            using var fileStream = new FileStream(TemporaryFile, FileMode.Create);
+
+            var compressor = new SevenZipCompressor
+            {
+                ArchiveFormat = OutArchiveFormat.SevenZip,
+                CompressionMethod = CompressionMethod.Lzma2,
+                CompressionMode = CompressionMode.Append,
+                ZipEncryptionMethod = ZipEncryptionMethod.Aes256,
+                CompressionLevel = CompressionLevel.Normal,
+                EncryptHeaders = true
+            };
+
+            compressor.CompressFilesEncrypted(fileStream, "password", @"TestData\zip.zip");
+
+            using var extractor = new SevenZipExtractor(TemporaryFile, "password");
+
+            Assert.AreEqual(1, extractor.FilesCount);
+            Assert.AreEqual("zip.zip", extractor.ArchiveFileNames[0]);
+        }
     }
 }
diff --git a/SevenZip/LibraryManager.cs b/SevenZip/LibraryManager.cs
@@ -421,7 +421,7 @@ public static IInArchive InArchive(InArchiveFormat format, object user)
         {
             lock (_syncRoot)
             {
-                if (_inArchives[user][format] == null)
+                if (!_inArchives.ContainsKey(user) || _inArchives[user][format] == null)
                 {
 #if NET472 || NETSTANDARD2_0
                     var sp = new SecurityPermission(SecurityPermissionFlag.UnmanagedCode);