more try/finally

Author: twsouthwick

src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeWrapper.cs

@@ -395,12 +395,12 @@ internal static unsafe uint SNIOpenSyncEx(
                     {
                         var writer = SqlObjectPools.BufferWriter.Rent();
 
-                        // Native SNI requires the Unicode encoding and any other encoding like UTF8 breaks the code.
-                        Encoding.Unicode.GetBytes(spn, writer);
-                        Trace.Assert(writer.WrittenCount <= SniMaxComposedSpnLength, "Length of the provided SPN exceeded the buffer size.");
-
                         try
                         {
+                            // Native SNI requires the Unicode encoding and any other encoding like UTF8 breaks the code.
+                            Encoding.Unicode.GetBytes(spn, writer);
+                            Trace.Assert(writer.WrittenCount <= SniMaxComposedSpnLength, "Length of the provided SPN exceeded the buffer size.");
+
                             fixed (byte* pin_spnBuffer = writer.WrittenSpan)
                             {
                                 clientConsumerInfo.szSPN = pin_spnBuffer;

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs

@@ -14,32 +14,39 @@ internal void ProcessSSPI(int receivedLength)
 
             SniContext outerContext = _physicalStateObj.SniContext;
             _physicalStateObj.SniContext = SniContext.Snix_ProcessSspi;
+
             // allocate received buffer based on length from SSPI message
             byte[] receivedBuff = ArrayPool<byte>.Shared.Rent(receivedLength);
 
-            // read SSPI data received from server
-            Debug.Assert(_physicalStateObj._syncOverAsync, "Should not attempt pends in a synchronous call");
-            TdsOperationStatus result = _physicalStateObj.TryReadByteArray(receivedBuff, receivedLength);
-            if (result != TdsOperationStatus.Done)
+            try
             {
-                throw SQL.SynchronousCallMayNotPend();
-            }
+                // read SSPI data received from server
+                Debug.Assert(_physicalStateObj._syncOverAsync, "Should not attempt pends in a synchronous call");
+                TdsOperationStatus result = _physicalStateObj.TryReadByteArray(receivedBuff, receivedLength);
+                if (result != TdsOperationStatus.Done)
+                {
+                    throw SQL.SynchronousCallMayNotPend();
+                }
 
-            // allocate send buffer and initialize length
-            var writer = SqlObjectPools.BufferWriter.Rent();
+                // allocate send buffer and initialize length
+                var writer = SqlObjectPools.BufferWriter.Rent();
 
-            try
-            {
-                // make call for SSPI data
-                _authenticationProvider!.SSPIData(receivedBuff.AsSpan(0, receivedLength), writer, _serverSpn);
+                try
+                {
+                    // make call for SSPI data
+                    _authenticationProvider!.SSPIData(receivedBuff.AsSpan(0, receivedLength), writer, _serverSpn);
 
-                // DO NOT SEND LENGTH - TDS DOC INCORRECT!  JUST SEND SSPI DATA!
-                _physicalStateObj.WriteByteSpan(writer.WrittenSpan);
+                    // DO NOT SEND LENGTH - TDS DOC INCORRECT!  JUST SEND SSPI DATA!
+                    _physicalStateObj.WriteByteSpan(writer.WrittenSpan);
 
+                }
+                finally
+                {
+                    SqlObjectPools.BufferWriter.Return(writer);
+                }
             }
             finally
             {
-                SqlObjectPools.BufferWriter.Return(writer);
                 ArrayPool<byte>.Shared.Return(receivedBuff, clearArray: true);
             }