Fix Incorrect usage of the ObjectDisposedException.ThrowIf (#54144)

gurustron · web-flow · commit 32c9ec8d9c4b · 2024-02-22T13:02:31.000+08:00
diff --git a/src/Http/Http/src/Internal/ReferenceReadStream.cs b/src/Http/Http/src/Internal/ReferenceReadStream.cs
@@ -147,6 +147,6 @@ protected override void Dispose(bool disposing)
 
     private void ThrowIfDisposed()
     {
-        ObjectDisposedException.ThrowIf(_disposed, nameof(ReferenceReadStream));
+        ObjectDisposedException.ThrowIf(_disposed, this);
     }
 }
diff --git a/src/Http/WebUtilities/src/BufferedReadStream.cs b/src/Http/WebUtilities/src/BufferedReadStream.cs
@@ -418,6 +418,6 @@ private static string DecodeLine(MemoryStream builder, bool foundCRLF)
 
     private void CheckDisposed()
     {
-        ObjectDisposedException.ThrowIf(_disposed, nameof(BufferedReadStream));
+        ObjectDisposedException.ThrowIf(_disposed, this);
     }
 }
diff --git a/src/Http/WebUtilities/src/FileBufferingReadStream.cs b/src/Http/WebUtilities/src/FileBufferingReadStream.cs
@@ -497,6 +497,6 @@ public override async ValueTask DisposeAsync()
 
     private void ThrowIfDisposed()
     {
-        ObjectDisposedException.ThrowIf(_disposed, nameof(FileBufferingReadStream));
+        ObjectDisposedException.ThrowIf(_disposed, this);
     }
 }
diff --git a/src/Http/WebUtilities/src/FileBufferingWriteStream.cs b/src/Http/WebUtilities/src/FileBufferingWriteStream.cs
@@ -288,6 +288,6 @@ private void EnsureFileStream()
 
     private void ThrowIfDisposed()
     {
-        ObjectDisposedException.ThrowIf(Disposed, nameof(FileBufferingWriteStream));
+        ObjectDisposedException.ThrowIf(Disposed, this);
     }
 }
diff --git a/src/Http/WebUtilities/src/HttpRequestStreamReader.cs b/src/Http/WebUtilities/src/HttpRequestStreamReader.cs
@@ -120,7 +120,7 @@ protected override void Dispose(bool disposing)
     /// <inheritdoc />
     public override int Peek()
     {
-        ObjectDisposedException.ThrowIf(_disposed, nameof(HttpRequestStreamReader));
+        ThrowIfDisposed();
 
         if (_charBufferIndex == _charsRead)
         {
@@ -136,7 +136,7 @@ public override int Peek()
     /// <inheritdoc />
     public override int Read()
     {
-        ObjectDisposedException.ThrowIf(_disposed, nameof(HttpRequestStreamReader));
+        ThrowIfDisposed();
 
         if (_charBufferIndex == _charsRead)
         {
@@ -172,7 +172,7 @@ public override int Read(Span<char> buffer)
             throw new ArgumentNullException(nameof(buffer));
         }
 
-        ObjectDisposedException.ThrowIf(_disposed, nameof(HttpRequestStreamReader));
+        ThrowIfDisposed();
 
         var count = buffer.Length;
         var charsRead = 0;
@@ -234,7 +234,7 @@ public override Task<int> ReadAsync(char[] buffer, int index, int count)
     [SuppressMessage("ApiDesign", "RS0027:Public API with optional parameter(s) should have the most parameters amongst its public overloads.", Justification = "Required to maintain compatibility")]
     public override async ValueTask<int> ReadAsync(Memory<char> buffer, CancellationToken cancellationToken = default)
     {
-        ObjectDisposedException.ThrowIf(_disposed, nameof(HttpRequestStreamReader));
+        ThrowIfDisposed();
 
         if (_charBufferIndex == _charsRead && await ReadIntoBufferAsync() == 0)
         {
@@ -324,7 +324,7 @@ public override async ValueTask<int> ReadAsync(Memory<char> buffer, Cancellation
     /// <inheritdoc />
     public override async Task<string?> ReadLineAsync()
     {
-        ObjectDisposedException.ThrowIf(_disposed, nameof(HttpRequestStreamReader));
+        ThrowIfDisposed();
 
         StringBuilder? sb = null;
         var consumeLineFeed = false;
@@ -359,7 +359,7 @@ public override async ValueTask<int> ReadAsync(Memory<char> buffer, Cancellation
     /// <inheritdoc />
     public override string? ReadLine()
     {
-        ObjectDisposedException.ThrowIf(_disposed, nameof(HttpRequestStreamReader));
+        ThrowIfDisposed();
 
         StringBuilder? sb = null;
         var consumeLineFeed = false;
@@ -545,4 +545,9 @@ private ReadLineStepResult(bool completed, string? result)
         public bool Completed { get; }
         public string? Result { get; }
     }
+
+    private void ThrowIfDisposed()
+    {
+        ObjectDisposedException.ThrowIf(_disposed, this);
+    }
 }
diff --git a/src/Http/WebUtilities/src/HttpResponseStreamWriter.cs b/src/Http/WebUtilities/src/HttpResponseStreamWriter.cs
@@ -105,7 +105,7 @@ public HttpResponseStreamWriter(
     /// <inheritdoc/>
     public override void Write(char value)
     {
-        ObjectDisposedException.ThrowIf(_disposed, nameof(HttpResponseStreamWriter));
+        ThrowIfDisposed();
 
         if (_charBufferCount == _charBufferSize)
         {
@@ -119,7 +119,7 @@ public override void Write(char value)
     /// <inheritdoc/>
     public override void Write(char[] values, int index, int count)
     {
-        ObjectDisposedException.ThrowIf(_disposed, nameof(HttpResponseStreamWriter));
+        ThrowIfDisposed();
 
         if (values == null)
         {
@@ -140,7 +140,7 @@ public override void Write(char[] values, int index, int count)
     /// <inheritdoc/>
     public override void Write(ReadOnlySpan<char> value)
     {
-        ObjectDisposedException.ThrowIf(_disposed, nameof(HttpResponseStreamWriter));
+        ThrowIfDisposed();
 
         var remaining = value.Length;
         while (remaining > 0)
@@ -160,7 +160,7 @@ public override void Write(ReadOnlySpan<char> value)
     /// <inheritdoc/>
     public override void Write(string? value)
     {
-        ObjectDisposedException.ThrowIf(_disposed, nameof(HttpResponseStreamWriter));
+        ThrowIfDisposed();
 
         if (value == null)
         {
@@ -183,7 +183,7 @@ public override void Write(string? value)
     /// <inheritdoc/>
     public override void WriteLine(ReadOnlySpan<char> value)
     {
-        ObjectDisposedException.ThrowIf(_disposed, nameof(HttpResponseStreamWriter));
+        ThrowIfDisposed();
 
         Write(value);
         Write(NewLine);
@@ -505,7 +505,7 @@ private async Task WriteLineAsyncAwaited(string value)
     /// <inheritdoc/>
     public override void Flush()
     {
-        ObjectDisposedException.ThrowIf(_disposed, nameof(HttpResponseStreamWriter));
+        ThrowIfDisposed();
 
         FlushInternal(flushEncoder: true);
     }
@@ -673,4 +673,9 @@ private static Task GetObjectDisposedTask()
     {
         return Task.FromException(new ObjectDisposedException(nameof(HttpResponseStreamWriter)));
     }
+
+    private void ThrowIfDisposed()
+    {
+        ObjectDisposedException.ThrowIf(_disposed, this);
+    }
 }
diff --git a/src/Http/WebUtilities/src/PagedByteBuffer.cs b/src/Http/WebUtilities/src/PagedByteBuffer.cs
@@ -136,6 +136,6 @@ private void ClearBuffers()
 
     private void ThrowIfDisposed()
     {
-        ObjectDisposedException.ThrowIf(Disposed, nameof(PagedByteBuffer));
+        ObjectDisposedException.ThrowIf(Disposed, this);
     }
 }
diff --git a/src/Servers/IIS/IIS/src/Core/WrappingStream.cs b/src/Servers/IIS/IIS/src/Core/WrappingStream.cs
@@ -15,7 +15,7 @@ public WrappingStream(Stream inner)
 
     public void SetInnerStream(Stream inner)
     {
-        ObjectDisposedException.ThrowIf(_disposed, nameof(WrappingStream));
+        ObjectDisposedException.ThrowIf(_disposed, this);
 
         _inner = inner;
     }

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,6 @@ protected override void Dispose(bool disposing)`
`147`	`147`
`148`	`148`	`private void ThrowIfDisposed()`
`149`	`149`	`{`
`150`		`- ObjectDisposedException.ThrowIf(_disposed, nameof(ReferenceReadStream));`
	`150`	`+ ObjectDisposedException.ThrowIf(_disposed, this);`
`151`	`151`	`}`
`152`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -418,6 +418,6 @@ private static string DecodeLine(MemoryStream builder, bool foundCRLF)`
`418`	`418`
`419`	`419`	`private void CheckDisposed()`
`420`	`420`	`{`
`421`		`- ObjectDisposedException.ThrowIf(_disposed, nameof(BufferedReadStream));`
	`421`	`+ ObjectDisposedException.ThrowIf(_disposed, this);`
`422`	`422`	`}`
`423`	`423`	`}`
Original file line number	Diff line number	Diff line change
`@@ -497,6 +497,6 @@ public override async ValueTask DisposeAsync()`
`497`	`497`
`498`	`498`	`private void ThrowIfDisposed()`
`499`	`499`	`{`
`500`		`- ObjectDisposedException.ThrowIf(_disposed, nameof(FileBufferingReadStream));`
	`500`	`+ ObjectDisposedException.ThrowIf(_disposed, this);`
`501`	`501`	`}`
`502`	`502`	`}`
Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,6 @@ private void EnsureFileStream()`
`288`	`288`
`289`	`289`	`private void ThrowIfDisposed()`
`290`	`290`	`{`
`291`		`- ObjectDisposedException.ThrowIf(Disposed, nameof(FileBufferingWriteStream));`
	`291`	`+ ObjectDisposedException.ThrowIf(Disposed, this);`
`292`	`292`	`}`
`293`	`293`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ protected override void Dispose(bool disposing)`
`120`	`120`	`/// <inheritdoc />`
`121`	`121`	`public override int Peek()`
`122`	`122`	`{`
`123`		`- ObjectDisposedException.ThrowIf(_disposed, nameof(HttpRequestStreamReader));`
	`123`	`+ ThrowIfDisposed();`
`124`	`124`
`125`	`125`	`if (_charBufferIndex == _charsRead)`
`126`	`126`	`{`
`@@ -136,7 +136,7 @@ public override int Peek()`
`136`	`136`	`/// <inheritdoc />`
`137`	`137`	`public override int Read()`
`138`	`138`	`{`
`139`		`- ObjectDisposedException.ThrowIf(_disposed, nameof(HttpRequestStreamReader));`
	`139`	`+ ThrowIfDisposed();`
`140`	`140`
`141`	`141`	`if (_charBufferIndex == _charsRead)`
`142`	`142`	`{`
`@@ -172,7 +172,7 @@ public override int Read(Span<char> buffer)`
`172`	`172`	`throw new ArgumentNullException(nameof(buffer));`
`173`	`173`	`}`
`174`	`174`
`175`		`- ObjectDisposedException.ThrowIf(_disposed, nameof(HttpRequestStreamReader));`
	`175`	`+ ThrowIfDisposed();`
`176`	`176`
`177`	`177`	`var count = buffer.Length;`
`178`	`178`	`var charsRead = 0;`
`@@ -234,7 +234,7 @@ public override Task<int> ReadAsync(char[] buffer, int index, int count)`
`234`	`234`	`[SuppressMessage("ApiDesign", "RS0027:Public API with optional parameter(s) should have the most parameters amongst its public overloads.", Justification = "Required to maintain compatibility")]`
`235`	`235`	`public override async ValueTask<int> ReadAsync(Memory<char> buffer, CancellationToken cancellationToken = default)`
`236`	`236`	`{`
`237`		`- ObjectDisposedException.ThrowIf(_disposed, nameof(HttpRequestStreamReader));`
	`237`	`+ ThrowIfDisposed();`
`238`	`238`
`239`	`239`	`if (_charBufferIndex == _charsRead && await ReadIntoBufferAsync() == 0)`
`240`	`240`	`{`
`@@ -324,7 +324,7 @@ public override async ValueTask<int> ReadAsync(Memory<char> buffer, Cancellation`
`324`	`324`	`/// <inheritdoc />`
`325`	`325`	`public override async Task<string?> ReadLineAsync()`
`326`	`326`	`{`
`327`		`- ObjectDisposedException.ThrowIf(_disposed, nameof(HttpRequestStreamReader));`
	`327`	`+ ThrowIfDisposed();`
`328`	`328`
`329`	`329`	`StringBuilder? sb = null;`
`330`	`330`	`var consumeLineFeed = false;`
`@@ -359,7 +359,7 @@ public override async ValueTask<int> ReadAsync(Memory<char> buffer, Cancellation`
`359`	`359`	`/// <inheritdoc />`
`360`	`360`	`public override string? ReadLine()`
`361`	`361`	`{`
`362`		`- ObjectDisposedException.ThrowIf(_disposed, nameof(HttpRequestStreamReader));`
	`362`	`+ ThrowIfDisposed();`
`363`	`363`
`364`	`364`	`StringBuilder? sb = null;`
`365`	`365`	`var consumeLineFeed = false;`
`@@ -545,4 +545,9 @@ private ReadLineStepResult(bool completed, string? result)`
`545`	`545`	`public bool Completed { get; }`
`546`	`546`	`public string? Result { get; }`
`547`	`547`	`}`
	`548`	`+`
	`549`	`+ private void ThrowIfDisposed()`
	`550`	`+ {`
	`551`	`+ ObjectDisposedException.ThrowIf(_disposed, this);`
	`552`	`+ }`
`548`	`553`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public HttpResponseStreamWriter(`
`105`	`105`	`/// <inheritdoc/>`
`106`	`106`	`public override void Write(char value)`
`107`	`107`	`{`
`108`		`- ObjectDisposedException.ThrowIf(_disposed, nameof(HttpResponseStreamWriter));`
	`108`	`+ ThrowIfDisposed();`
`109`	`109`
`110`	`110`	`if (_charBufferCount == _charBufferSize)`
`111`	`111`	`{`
`@@ -119,7 +119,7 @@ public override void Write(char value)`
`119`	`119`	`/// <inheritdoc/>`
`120`	`120`	`public override void Write(char[] values, int index, int count)`
`121`	`121`	`{`
`122`		`- ObjectDisposedException.ThrowIf(_disposed, nameof(HttpResponseStreamWriter));`
	`122`	`+ ThrowIfDisposed();`
`123`	`123`
`124`	`124`	`if (values == null)`
`125`	`125`	`{`
`@@ -140,7 +140,7 @@ public override void Write(char[] values, int index, int count)`
`140`	`140`	`/// <inheritdoc/>`
`141`	`141`	`public override void Write(ReadOnlySpan<char> value)`
`142`	`142`	`{`
`143`		`- ObjectDisposedException.ThrowIf(_disposed, nameof(HttpResponseStreamWriter));`
	`143`	`+ ThrowIfDisposed();`
`144`	`144`
`145`	`145`	`var remaining = value.Length;`
`146`	`146`	`while (remaining > 0)`
`@@ -160,7 +160,7 @@ public override void Write(ReadOnlySpan<char> value)`
`160`	`160`	`/// <inheritdoc/>`
`161`	`161`	`public override void Write(string? value)`
`162`	`162`	`{`
`163`		`- ObjectDisposedException.ThrowIf(_disposed, nameof(HttpResponseStreamWriter));`
	`163`	`+ ThrowIfDisposed();`
`164`	`164`
`165`	`165`	`if (value == null)`
`166`	`166`	`{`
`@@ -183,7 +183,7 @@ public override void Write(string? value)`
`183`	`183`	`/// <inheritdoc/>`
`184`	`184`	`public override void WriteLine(ReadOnlySpan<char> value)`
`185`	`185`	`{`
`186`		`- ObjectDisposedException.ThrowIf(_disposed, nameof(HttpResponseStreamWriter));`
	`186`	`+ ThrowIfDisposed();`
`187`	`187`
`188`	`188`	`Write(value);`
`189`	`189`	`Write(NewLine);`
`@@ -505,7 +505,7 @@ private async Task WriteLineAsyncAwaited(string value)`
`505`	`505`	`/// <inheritdoc/>`
`506`	`506`	`public override void Flush()`
`507`	`507`	`{`
`508`		`- ObjectDisposedException.ThrowIf(_disposed, nameof(HttpResponseStreamWriter));`
	`508`	`+ ThrowIfDisposed();`
`509`	`509`
`510`	`510`	`FlushInternal(flushEncoder: true);`
`511`	`511`	`}`
`@@ -673,4 +673,9 @@ private static Task GetObjectDisposedTask()`
`673`	`673`	`{`
`674`	`674`	`return Task.FromException(new ObjectDisposedException(nameof(HttpResponseStreamWriter)));`
`675`	`675`	`}`
	`676`	`+`
	`677`	`+ private void ThrowIfDisposed()`
	`678`	`+ {`
	`679`	`+ ObjectDisposedException.ThrowIf(_disposed, this);`
	`680`	`+ }`
`676`	`681`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,6 @@ private void ClearBuffers()`
`136`	`136`
`137`	`137`	`private void ThrowIfDisposed()`
`138`	`138`	`{`
`139`		`- ObjectDisposedException.ThrowIf(Disposed, nameof(PagedByteBuffer));`
	`139`	`+ ObjectDisposedException.ThrowIf(Disposed, this);`
`140`	`140`	`}`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public WrappingStream(Stream inner)`
`15`	`15`
`16`	`16`	`public void SetInnerStream(Stream inner)`
`17`	`17`	`{`
`18`		`- ObjectDisposedException.ThrowIf(_disposed, nameof(WrappingStream));`
	`18`	`+ ObjectDisposedException.ThrowIf(_disposed, this);`
`19`	`19`
`20`	`20`	`_inner = inner;`
`21`	`21`	`}`