MailScanner/v5
1
1
Fork 0
mirror of https://github.com/MailScanner/v5.git synced 2025-02-22 22:43:23 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refine HTML disarm failure logic (#572)

Browse source
This commit is contained in:
Shawn Iverson 2021-11-28 14:38:57 -05:00 committed by GitHub
parent 0066bb3276
commit 9a7e1cb5e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
common/usr/share/MailScanner/perl/MailScanner/Message.pm
View file

@ -7462,6 +7462,7 @@ sub DisarmHTMLEntity {
# In the parent.
my @DisarmDoneSomething;
my $pipeEnd = 0;
eval {
$pipe->reader();
local $SIG{ALRM} = sub { die "Command Timed Out" };
@ -7469,21 +7470,29 @@ sub DisarmHTMLEntity {
# Read the contents of %DisarmDoneSomething from the pipe
my($pipedata);
while (defined($pipedata = <$pipe>)) {
last if $pipedata eq "ENDENDEND\n";
if ($pipedata eq "ENDENDEND\n") {
$pipeEnd = 1;
last;
}
chomp $pipedata;
push @DisarmDoneSomething, $pipedata;
#print STDERR "DisarmDoneSomething $pipedata\n";
}
waitpid $pid, 0;
# If we made it here, the child has safely closed, do not close pipe in the parent
# We will check for pid instead of relying on the pipe close logic to determine failure
# If we made it here, the child has hopefully safely closed, we'll still close pipe in the parent
# We will check for pid and pipeEnd instead of relying on the pipe close logic to determine failure
# https://github.com/MailScanner/v5/issues/546
#$pipe->close;
$pipe->close;
#$PipeReturn = $?;
alarm 0;
$pid = 0;
# Clean exit
$ChildReturn = 0;
# Clean exit, unless it does so before reaching the end
if ($pipeEnd == 1) {
$ChildReturn = 0;
} else {
$ChildReturn = 2;
}
};
alarm 0;
# Workaround for bug in perl shipped with Solaris 9,