Imported Upstream version 5.16.0.152

Former-commit-id: b9a8a4634edd84ed92dc74f4022c4364731da78c
2018-09-08 08:32:49 +00:00
parent c92293d6a6
commit 0ccc9f0ce1
41 changed files with 40 additions and 35 deletions
--- a/mcs/class/System/System.IO.Compression/DeflateStream.cs
+++ b/mcs/class/System/System.IO.Compression/DeflateStream.cs
@ -380,7 +380,12 @@ namespace System.IO.Compression
 				GC.SuppressFinalize (this);
 			
 				io_buffer = null;
-			
+			} else {
+				// When we are in the finalizer we don't want to access the underlying stream anymore
+				base_stream = Stream.Null;
+			}
+
+			if (z_stream != null) {
 				z_stream.Dispose();
 			}