Run texvc via wfShellExec(), so that execution time is limited.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 51495f4..3c32a06 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -92,6 +92,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 21477) \& can now be used in <math>
 * (bug 11641) \dotsc \dotsm \dotsi \dotso can now be used in <math>
 * (bug 21475) \mathtt and \textsf can now be used in <math>
+* texvc is now run via ulimit4.sh, to limit execution time.
 
 === Bug fixes in 1.17 ===
 * (bug 17560) Half-broken deletion moved image files to deletion archive

diff --git a/includes/Math.php b/includes/Math.php
index be8b878..acf110f 100644 (file)
--- a/includes/Math.php
+++ b/includes/Math.php
@@ -72,7 +72,7 @@ class MathRenderer {
                        }
 
                        wfDebug( "TeX: $cmd\n" );
-                       $contents = `$cmd`;
+                       $contents = wfShellExec( $cmd );
                        wfDebug( "TeX output:\n $contents\n---\n" );
 
                        if (strlen($contents) == 0) {