Move taking of lock earlier to avoid race in PruneCallback

Fixes #29952
dotnet · Jan 19, 2023 · 235ff8e · 235ff8e
1 parent 00e218a
commit 235ff8e
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/Microsoft.Data.Sqlite.Core/SqliteConnectionFactory.cs b/src/Microsoft.Data.Sqlite.Core/SqliteConnectionFactory.cs
@@ -138,20 +138,21 @@ private void PruneCallback(object? _)
                 }
             }
 
-            for (var i = _idlePoolGroups.Count - 1; i >= 0; i--)
+            _lock.EnterWriteLock();
+
+            try
             {
-                var poolGroup = _idlePoolGroups[i];
 
-                if (!poolGroup.Clear())
+                for (var i = _idlePoolGroups.Count - 1; i >= 0; i--)
                 {
-                    _idlePoolGroups.Remove(poolGroup);
-                }
-            }
+                    var poolGroup = _idlePoolGroups[i];
 
-            _lock.EnterWriteLock();
+                    if (!poolGroup.Clear())
+                    {
+                        _idlePoolGroups.Remove(poolGroup);
+                    }
+                }
 
-            try
-            {
                 var activePoolGroups = new Dictionary<string, SqliteConnectionPoolGroup>();
                 foreach (var entry in _poolGroups)
                 {