Imported Upstream version 6.4.0.152

Former-commit-id: 9581b2879201a39de16b05882d3ad003b4a23a64
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-08-06 08:46:27 +00:00
parent 345224e2bc
commit 354a7ffa75
54 changed files with 58 additions and 53 deletions

View File

@ -104,8 +104,13 @@ namespace System.IO.Compression
{
}
~DeflateStream () => Dispose (false);
protected override void Dispose (bool disposing)
{
if (disposing)
GC.SuppressFinalize (this);
native.Dispose (disposing);
if (disposing && !disposed) {
@ -380,12 +385,12 @@ namespace System.IO.Compression
if (disposing && !disposed) {
disposed = true;
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;
}
io_buffer = null;
if (z_stream != null) {
z_stream.Dispose();