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

* FPrevent file descriptor leaks, event to control closing descriptor

Browse Source
This commit is contained in:
Michaël Van Canneyt 2023-12-17 15:33:05 +01:00
parent 409abb8a43
commit 9546595c15
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/fcl-process/src/process.pp
View File

@ -63,7 +63,8 @@ Type
TIOType = (iotNone, iotPipe, iotFile, iotHandle, iotProcess, iotNull);
TProcessHandleType = (phtInput,phtOutput,phtError);
TGetHandleEvent = procedure(Sender : TObject; var aHandle : THandle) of object;
TGetHandleEvent = procedure(Sender : TObject; var aHandle : THandle; var CloseOnExecute : Boolean) of object;
TAfterAllocateHandleEvent = procedure(Sender : TObject; aHandle : THandle; var CloseOnExecute : Boolean) of object;
{ TIODescriptor }
TProcess = Class;

16
packages/fcl-process/src/processbody.inc
View File

@ -42,8 +42,11 @@ Type
TFileWriteMode = (fwmTruncate, fwmAppend, fwmAtstart);
TIODescriptor = class(TPersistent)
private
FAfterAllocateHandle: TAfterAllocateHandleEvent;
FCloseHandleOnExecute: Boolean;
FCustomHandle: THandle;
FFileWriteMode: TFileWriteMode;
FHandleType: TProcessHandleType;
@ -79,13 +82,14 @@ Type
Function ResolveProcessHandle : THandle;
Function ResolveStream : THandleStream;
Procedure CloseOurHandle;
Procedure CloseTheirHandle;
Procedure CloseTheirHandle(aForceClose : Boolean = false);
Procedure PrepareHandles;
Procedure ResetHandles;
Property OwnerProcess : TProcess Read FOwnerProcess;
Property PipeBufferSize : cardinal read FPipeBufferSize write FPipeBufferSize;
Property OurHandle: THandle Read FOurHandle;
Property HandleValid : Boolean Read FHandleValid;
Property CloseHandleOnExecute : Boolean Read FCloseHandleOnExecute Write FCloseHandleOnExecute;
public
Constructor Create(aOwnerProcess : TProcess; aType : TProcessHandleType);
Destructor Destroy; override;
@ -96,6 +100,7 @@ Type
Property IOType : TIOType Read FIOType Write SetIOType;
Property FileName : TFileName Read FFileName Write SetFileName;
Property OnGetHandle : TGetHandleEvent Read FOnGetHandle Write FOnGetHandle;
Property AfterAllocateHandle : TAfterAllocateHandleEvent Read FAfterAllocateHandle Write FAfterAllocateHandle;
Property Process : TProcess Read FProcess Write SetProcess;
Property FileWriteMode : TFileWriteMode Read FFileWriteMode Write SetFileWriteMode;
end;
@ -1010,7 +1015,7 @@ Function TIODescriptor.CreateCustomHandle : THandle;
begin
Result:=FCustomHandle;
if Assigned(FOnGetHandle) then
FOnGetHandle(Self,Result);
FOnGetHandle(Self,Result,FCloseHandleOnExecute);
if FCustomHandle=THandle(INVALID_HANDLE_VALUE) then
Raise EProcess.Create('Cannot get custom handle. No handle set');
end;
@ -1059,13 +1064,15 @@ begin
FOurHandle:=THandle(INVALID_HANDLE_VALUE) ;
end;
procedure TIODescriptor.CloseTheirHandle;
procedure TIODescriptor.CloseTheirHandle(aForceClose: Boolean);
var
H : THandle;
begin
if (IOType=iotNone) or Not FHandleValid then
exit;
If not (CloseHandleOnExecute or aForceClose) then
exit;
H:=ResolveProcessHandle;
// Writeln(StdErr,GetProcessID,' : ',ProcessHandleType,' closing their handle ',IOType,': ',H);
if H<>THandle(INVALID_HANDLE_VALUE) then
@ -1117,7 +1124,10 @@ begin
iotHandle : H:=CreateCustomHandle;
iotNull : H:=CreateNullFileHandle;
end;
FCloseHandleOnExecute:=(IOType<>iotNone);
FTheirHandle:=PrepareCreatedHandleForProcess(H);
if Assigned(FAfterAllocateHandle) then
FAfterAllocateHandle(Self,FTheirHandle,FCloseHandleOnExecute);
FHandleValid:=True;
end;
Result:=FTheirHandle;