procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Ada] Stabilize exit code on close process

Browse source 
Call Kill before close input handler in Close routine.  Otherwise close
input handler can terminate process before Kill and exit code became
unpredictable.

gcc/ada/

	* libgnat/g-expect.adb (Close): Call Kill before Close_Input.
This commit is contained in:
Dmitriy Anisimkov 2021-12-21 12:01:32 +06:00 • committed by Pierre-Marie de Rodat
parent 1e2334302d
commit 9a6f7575c1
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gcc/ada/libgnat/g-expect.adb
View file

@ -222,6 +222,10 @@ package body GNAT.Expect is
Next_Filter : Filter_List;
begin
if Descriptor.Pid > 0 then -- see comment in Send_Signal
Kill (Descriptor.Pid, Sig_Num => 9, Close => 0);
end if;
Close_Input (Descriptor);
if Descriptor.Error_Fd /= Descriptor.Output_Fd
@ -234,12 +238,6 @@ package body GNAT.Expect is
Close (Descriptor.Output_Fd);
end if;
-- ??? Should have timeouts for different signals
if Descriptor.Pid > 0 then -- see comment in Send_Signal
Kill (Descriptor.Pid, Sig_Num => 9, Close => 0);
end if;
GNAT.OS_Lib.Free (Descriptor.Buffer);
Descriptor.Buffer_Size := 0;