Fix failure to dispose stream when exception occurs in Package.Open (d…

…otnet#46796)

* Fix packaging bug

* Update Tests.cs

* CR feedback

src/libraries/System.IO.Packaging/src/System/IO/Packaging/ZipPackage.cs

@@ -282,10 +282,8 @@ internal ZipPackage(string path, FileMode packageFileMode, FileAccess packageFil
             }
             catch
             {
-                if (zipArchive != null)
-                {
-                    zipArchive.Dispose();
-                }
+                zipArchive?.Dispose();
+                _containerStream?.Dispose();
 
                 throw;
             }

src/libraries/System.IO.Packaging/tests/Tests.cs

@@ -181,6 +181,26 @@ public void PackageOpen_Open_EmptyStream_Throws()
             }
         }
 
+        [Fact]
+        public void PackageOpen_Open_InvalidContent_Throws()
+        {
+            string temp = GetTempFileInfoWithExtension(".docx").FullName;
+
+            using (FileStream fs = File.OpenWrite(temp))
+            {
+                byte[] bytes = File.ReadAllBytes("plain.docx");
+                bytes.AsSpan(500, 500).Clear(); // garble it
+                fs.Write(bytes, 0, bytes.Length);
+            }
+
+            AssertExtensions.ThrowsAny<InvalidDataException, ArgumentOutOfRangeException>(
+                () => Package.Open(temp, FileMode.Open, FileAccess.Read, FileShare.Read));
+
+            // Package should not have held a stream open on the file; if it did, this operation will
+            // throw IOException (unless the finalizer runs first, and it will not do so deterministically)
+            File.Move(temp, GetTestFilePath());
+        }
+
         [Fact]
         public void T172_EmptyRelationshipPart()
         {