Merge pull request #122 from jkour/Pool-AV

[pool] An AV occurs in TPoolItem
exilon · Oct 15, 2024 · 3fb5b84 · 3fb5b84
2 parents 92e8f5d + 815fe83
commit 3fb5b84
Show file tree

Hide file tree

Showing 2 changed files with 410 additions and 266 deletions.
diff --git a/Quick.Pooling.pas b/Quick.Pooling.pas
@@ -295,22 +295,22 @@ function TPoolItem<T>._AddRef: Integer;
 
 function TPoolItem<T>._Release: Integer;
 begin
-  fLock.Enter;
   {$IFDEF DEBUG_OBJPOOL}
   TDebugger.Trace(Self,'Released Pool item');
   {$ENDIF}
   try
-    Dec(fRefCount);
-    Result := fRefCount;
+    result:=AtomicDecrement(fRefCount);
     if Result = 0 then
     begin
       FreeAndNil(fItem);
+      // The following is take from TInterfacedObject._Release()
+      // Mark the refcount field so that any refcounting during destruction doesn't infinitely recurse.
+      __MarkDestroying(Self);
       Destroy;
     end
     else fLastAccess := Now;
   finally
     if fRefCount = 1 then fSemaphore.Release;
-    fLock.Leave;
   end;
 end;