Use eval "$4" instead of "$@", so that shell metacharacters such as "(" are understood

diff --git a/bin/ulimit4.sh b/bin/ulimit4.sh
new file mode 100755 (executable)
index 0000000..2a840d2
--- /dev/null
+++ b/bin/ulimit4.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+ulimit -t $1 -v $2 -f $3
+eval "$4"

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 291224b..1ffde74 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1820,14 +1820,14 @@ function wfShellExec( $cmd, &$retval=null ) {
        }
 
        if ( php_uname( 's' ) == 'Linux' ) {
-               $time = ini_get( 'max_execution_time' );
+               $time = intval( ini_get( 'max_execution_time' ) );
                $mem = intval( $wgMaxShellMemory );
                $filesize = intval( $wgMaxShellFileSize );
 
                if ( $time > 0 && $mem > 0 ) {
-                       $script = "$IP/bin/ulimit-tvf.sh";
+                       $script = "$IP/bin/ulimit4.sh";
                        if ( is_executable( $script ) ) {
-                               $cmd = escapeshellarg( $script ) . " $time $mem $filesize $cmd";
+                               $cmd = escapeshellarg( $script ) . " $time $mem $filesize " . escapeshellarg( $cmd );
                        }
                }
        } elseif ( php_uname( 's' ) == 'Windows NT' ) {