Making sure stream is closed when exception is thrown

Stream will never be closed if we throw exception in Open
which leads to file being locked in Windows and that we
leak file handles.

1 files changed, 6 insertions, 1 deletions

diff --git a/mcs/class/WindowsBase/System.IO.Packaging/Package.cs b/mcs/class/WindowsBase/System.IO.Packaging/Package.cs
index e4b4ae11d2a..002d5921baf 100644..100755
--- a/mcs/class/WindowsBase/System.IO.Packaging/Package.cs
+++ b/mcs/class/WindowsBase/System.IO.Packaging/Package.cs
@@ -404,7 +404,12 @@ namespace System.IO.Packaging {
 				throw new FileFormatException ("Stream length cannot be zero with FileMode.Open");
 
 			Stream s = File.Open (path, packageMode, packageAccess, packageShare);
-			return Open (s, packageMode, packageAccess, true);
+			try {
+				return Open (s, packageMode, packageAccess, true);
+			} catch {
+				s.Close  ();
+				throw;
+			}
 		}
 
 		static Package OpenCore (Stream stream, FileMode packageMode, FileAccess packageAccess, bool ownsStream)