Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F86489
D7651.diff
All Users
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
1 KB
Referenced Files
None
Subscribers
None
D7651.diff
View Options
diff --git a/src/infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterCowsay.php b/src/infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterCowsay.php
--- a/src/infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterCowsay.php
+++ b/src/infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterCowsay.php
@@ -29,6 +29,7 @@
$tongue,
$cow);
+ $future->setTimeout(15);
$future->write($content);
list($err, $stdout, $stderr) = $future->resolve();
diff --git a/src/infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterFiglet.php b/src/infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterFiglet.php
--- a/src/infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterFiglet.php
+++ b/src/infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterFiglet.php
@@ -14,6 +14,7 @@
}
$future = id(new ExecFuture('figlet'))
+ ->setTimeout(15)
->write(trim($content, "\n"));
list($err, $stdout, $stderr) = $future->resolve();
diff --git a/src/infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterGraphviz.php b/src/infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterGraphviz.php
--- a/src/infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterGraphviz.php
+++ b/src/infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterGraphviz.php
@@ -14,14 +14,17 @@
}
$future = id(new ExecFuture('dot -T%s', 'png'))
+ ->setTimeout(15)
->write(trim($content));
list($err, $stdout, $stderr) = $future->resolve();
if ($err) {
return $this->markupError(
pht(
- 'Execution of `dot` failed, check your syntax: %s', $stderr));
+ 'Execution of `dot` failed (#%d), check your syntax: %s',
+ $err,
+ $stderr));
}
$file = PhabricatorFile::buildFromFileDataOrHash(
File Metadata
Details
Attached
Mime Type
text/x-diff
Storage Engine
amazon-s3
Storage Format
Raw Data
Storage Handle
phabricator/qf/hf/mrn5rwfip7xfjwyg
Default Alt Text
D7651.diff (1 KB)
Attached To
Mode
D7651: Timeout `interpreter {{{ ... }}}` blocks after 15 seconds
Attached
Detach File
Event Timeline
Log In to Comment