Add using where needed to dispose objects

SteamRE · Oct 19, 2023 · a371559 · a371559
1 parent 76f0b9a
commit a371559
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 12 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -63,3 +63,6 @@ dotnet_style_prefer_is_null_check_over_reference_equality_method = false:silent
 
 dotnet_style_predefined_type_for_locals_parameters_members = true:silent
 dotnet_style_predefined_type_for_member_access = true:silent
+
+# CA2000: Dispose objects before losing scope
+dotnet_diagnostic.CA2000.severity = suggestion
diff --git a/Samples/1b.QrCodeAuthentication/Program.cs b/Samples/1b.QrCodeAuthentication/Program.cs
@@ -101,9 +101,9 @@ void DrawQRCode( QrAuthSession authSession )
     Console.WriteLine();
 
     // Encode the link as a QR code
-    var qrGenerator = new QRCodeGenerator();
+    using var qrGenerator = new QRCodeGenerator();
     var qrCodeData = qrGenerator.CreateQrCode( authSession.ChallengeURL, QRCodeGenerator.ECCLevel.L );
-    var qrCode = new AsciiQRCode( qrCodeData );
+    using var qrCode = new AsciiQRCode( qrCodeData );
     var qrCodeAsAsciiArt = qrCode.GetGraphic( 1, drawQuietZones: false );
 
     Console.WriteLine( "Use the Steam Mobile App to sign in via QR code:" );

diff --git a/SteamKit2/SteamKit2/Networking/Steam3/UdpConnection.cs b/SteamKit2/SteamKit2/Networking/Steam3/UdpConnection.cs
@@ -181,7 +181,8 @@ public void Send( byte[] data )
             if ( state != (int)State.Connected )
                 return;
 
-            SendData( new MemoryStream( data ) );
+            using var ms = new MemoryStream( data );
+            SendData( ms );
         }
 
         /// <summary>
@@ -355,7 +356,7 @@ private bool DispatchMessage()
             if ( numPackets == 0 )
                 return false;
 
-            MemoryStream payload = new MemoryStream();
+            using MemoryStream payload = new MemoryStream();
             for ( uint i = 0; i < numPackets; i++ )
             {
                 var handled = inPackets.TryGetValue(++inSeqHandled, out var packet);
@@ -431,7 +432,7 @@ private void NetLoop(object? param)
                         // Data from the desired server was received; delay timeout
                         timeOut = DateTime.Now.AddSeconds(TIMEOUT_DELAY);
 
-                        MemoryStream ms = new MemoryStream(buf, 0, length);
+                        using MemoryStream ms = new MemoryStream(buf, 0, length);
                         UdpPacket packet = new UdpPacket(ms);
 
                         ReceivePacket(packet);

diff --git a/SteamKit2/SteamKit2/Steam/SteamClient/CallbackMgr/CallbackMgr.cs b/SteamKit2/SteamKit2/Steam/SteamClient/CallbackMgr/CallbackMgr.cs
@@ -7,7 +7,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using SteamKit2.Internal;
 
 namespace SteamKit2
@@ -112,7 +111,9 @@ public IDisposable Subscribe<TCallback>( JobID jobID, Action<TCallback> callback
                 throw new ArgumentNullException( nameof(callbackFunc) );
             }
 
+#pragma warning disable CA2000 // Not implicitly disposed
             var callback = new Internal.Callback<TCallback>( callbackFunc, this, jobID );
+#pragma warning restore CA2000
             return new Subscription( callback, this );
         }
 

diff --git a/SteamKit2/SteamKit2/Steam/WebAPI/ContentServerDirectoryService.cs b/SteamKit2/SteamKit2/Steam/WebAPI/ContentServerDirectoryService.cs
@@ -60,7 +60,7 @@ public static class ContentServerDirectoryService
                 throw new ArgumentNullException( nameof( configuration ) );
             }
 
-            var directory = configuration.GetAsyncWebAPIInterface( "IContentServerDirectoryService" );
+            using var directory = configuration.GetAsyncWebAPIInterface( "IContentServerDirectoryService" );
             var args = new Dictionary<string, object?>();
 
             if ( cellId.HasValue )

diff --git a/SteamKit2/SteamKit2/Steam/WebAPI/SteamDirectory.cs b/SteamKit2/SteamKit2/Steam/WebAPI/SteamDirectory.cs
@@ -47,7 +47,7 @@ static async Task<IReadOnlyCollection<ServerRecord>> LoadCoreAsync( SteamConfigu
                 throw new ArgumentNullException( nameof(configuration) );
             }
 
-            var directory = configuration.GetAsyncWebAPIInterface( "ISteamDirectory" );
+            using var directory = configuration.GetAsyncWebAPIInterface( "ISteamDirectory" );
             var args = new Dictionary<string, object?>
             {
                 ["cellid"] = configuration.CellID.ToString( CultureInfo.InvariantCulture )

diff --git a/SteamKit2/SteamKit2/Steam/WebAPI/WebAPI.cs b/SteamKit2/SteamKit2/Steam/WebAPI/WebAPI.cs
@@ -415,7 +415,7 @@ private async Task<HttpResponseMessage> CallAsyncInternal( HttpMethod method, st
                     }
                 }
 
-                var request = new HttpRequestMessage( method, urlBuilder.ToString() );
+                using var request = new HttpRequestMessage( method, urlBuilder.ToString() );
 
                 if ( !paramsGoInQueryString )
                 {

diff --git a/SteamKit2/SteamKit2/Util/HardwareUtils.cs b/SteamKit2/SteamKit2/Util/HardwareUtils.cs
@@ -88,9 +88,8 @@ sealed class WindowsMachineInfoProvider : IMachineInfoProvider
     {
         public byte[]? GetMachineGuid()
         {
-            var localKey = RegistryKey
-                .OpenBaseKey( Microsoft.Win32.RegistryHive.LocalMachine, RegistryView.Registry64 )
-                .OpenSubKey( @"SOFTWARE\Microsoft\Cryptography" );
+            using var baseKey = RegistryKey.OpenBaseKey( Microsoft.Win32.RegistryHive.LocalMachine, RegistryView.Registry64 );
+            using var localKey = baseKey.OpenSubKey( @"SOFTWARE\Microsoft\Cryptography" );
 
             if ( localKey == null )
             {