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/rst.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/rst.pm')
| -rw-r--r-- | IkiWiki/Plugin/rst.pm | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/IkiWiki/Plugin/rst.pm b/IkiWiki/Plugin/rst.pm index 1fd13d1f5..afd60f668 100644 --- a/IkiWiki/Plugin/rst.pm +++ b/IkiWiki/Plugin/rst.pm @@ -43,21 +43,11 @@ sub htmlize (@) { #{{{ my %params=@_; my $content=$params{content}; - my $tries=10; my $pid; - while (1) { - eval { - # Try to call python and run our command - $pid=open2(*IN, *OUT, "python", "-c", $pyCmnd) - or return $content; - }; - last unless $@; - $tries--; - if ($tries < 1) { - debug("failed to run python to convert rst: $@"); - return $content; - } - } + my $sigpipe=0; + $SIG{PIPE}=sub { $sigpipe=1 }; + $pid=open2(*IN, *OUT, "python", "-c", $pyCmnd); + # open2 doesn't respect "use open ':utf8'" binmode (IN, ':utf8'); binmode (OUT, ':utf8'); @@ -70,6 +60,9 @@ sub htmlize (@) { #{{{ close IN; waitpid $pid, 0; + return $content if $sigpipe; + $SIG{PIPE}="DEFAULT"; + return $ret; } # }}} |