PR #11610 from kirkoman: fix: close ObjectPool race condition (#8334)

IntelRealSense · Mar 27, 2023 · e1316a7 · e1316a7
2 parents 065ee51 + d411db4
commit e1316a7
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/wrappers/csharp/Intel.RealSense/Helpers/ObjectPool.cs b/wrappers/csharp/Intel.RealSense/Helpers/ObjectPool.cs
@@ -74,23 +74,17 @@ private static object CreateInstance(Type t, IntPtr ptr)
         private static object Get(Type t, IntPtr ptr)
         {
             var stack = GetPool(t);
-            int count;
             lock ((stack as ICollection).SyncRoot)
             {
-                count = stack.Count;
-            }
-
-            if (count > 0)
-            {
-                Base.PooledObject obj;
-                lock ((stack as ICollection).SyncRoot)
+                if (stack.Count > 0)
                 {
+                    Base.PooledObject obj;
                     obj = stack.Pop();
-                }
 
-                obj.m_instance.Reset(ptr);
-                obj.Initialize();
-                return obj;
+                    obj.m_instance.Reset(ptr);
+                    obj.Initialize();
+                    return obj;
+                }
             }
 
             return CreateInstance(t, ptr);