diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-09-25 21:38:25 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-09-25 21:38:25 +0000 |
| commit | 9f45c3080e893174751b9a4b7fe3e59da611a2ec (patch) | |
| tree | f189927374d2c4991f0226ddf70b5a32a82ed5a5 /IkiWiki/Plugin/htmltidy.pm | |
| parent | 48e004acb1cd8d09dfa52377bd48edaee293bc9f (diff) | |
| download | ikiwiki-9f45c3080e893174751b9a4b7fe3e59da611a2ec.tar ikiwiki-9f45c3080e893174751b9a4b7fe3e59da611a2ec.tar.gz | |
* Fix a forkbomb in various calls to IPC::Open2, which has a highly
braindead interface. Closes: #389383
Diffstat (limited to 'IkiWiki/Plugin/htmltidy.pm')
| -rw-r--r-- | IkiWiki/Plugin/htmltidy.pm | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index 906c677dc..0609e72c3 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -19,21 +19,13 @@ sub import { #{{{ sub sanitize (@) { #{{{ my %params=@_; - my $tries=10; my $pid; - while (1) { - eval { - $pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no'); - }; - last unless $@; - $tries--; - if ($tries < 1) { - debug("failed to run tidy: $@"); - return $params{content}; - } - } + my $sigpipe=0; + $SIG{PIPE}=sub { $sigpipe=1 }; + $pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no'); + # open2 doesn't respect "use open ':utf8'" - binmode (IN, ':utf8'); + binmode (IN, ':utf8'); binmode (OUT, ':utf8'); print OUT $params{content}; @@ -44,6 +36,9 @@ sub sanitize (@) { #{{{ close IN; waitpid $pid, 0; + return $params{content} if $sigpipe; + $SIG{PIPE}="DEFAULT"; + return $ret; } # }}} |