paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-06 15:47:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

* TThread, Windows implementation: prevent resource leak when destroying an initially suspended and never resumed thread. The thread must be always resumed so that ThreadProc can complete and cleanup. Fixes Mantis #17560.

Browse Source 
git-svn-id: trunk@16290 -
This commit is contained in:
sergei 2010-11-01 22:37:33 +00:00
parent 8ca3c8301b
commit ffc357a528
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtl/objpas/classes/classes.inc
View File

@ -90,7 +90,11 @@ function ThreadProc(ThreadObjPtr: Pointer): PtrInt;
// will call the AfterConstruction method in all cases)
// Thread.Suspend;
try
Thread.Execute;
{ The thread may be already terminated at this point, e.g. if it was intially
suspended, or if it wasn't ever scheduled for execution for whatever reason.
So bypass user code if terminated. }
if not Thread.Terminated then
Thread.Execute;
except
Thread.FFatalException := TObject(AcquireExceptionObject);
end;

9
rtl/win/tthread.inc
View File

@ -30,9 +30,16 @@ destructor TThread.Destroy;
begin
if FHandle<>0 then
begin
if not FFinished and not Suspended then
{ Don't check Suspended. If the thread has been externally suspended (which is
deprecated and strongly discouraged), it's better to deadlock here than
to silently free the object and leave OS resources leaked. }
if not FFinished {and not Suspended} then
begin
Terminate;
{ Allow the thread function to perform the necessary cleanup. Since
we've just set Terminated flag, it won't call Execute. }
if FInitialSuspended then
Start;
WaitFor;
end;
CloseHandle(FHandle);