Item9140: correct template analysis; thanks Mikhail Ryazanov for spot…

…ting this one git-svn-id: http://svn.foswiki.org/trunk@7723 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Jun 11, 2010 · eb3438f · eb3438f
1 parent 24bd704
commit eb3438f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/UnitTestContrib/test/unit/RobustnessTests.pm b/UnitTestContrib/test/unit/RobustnessTests.pm
@@ -237,6 +237,10 @@ sub verify {
       Foswiki::Sandbox->sysCommand( 'sh -c %A%', A => 'echo urmf; exit 7' );
     $this->assert( $exit != 0 );
     $this->assert_str_equals( "urmf\n", $out );
+    ( $out, $exit ) =
+      Foswiki::Sandbox->sysCommand( 'echo' );
+    $this->assert_equals( 0, $exit );
+    $this->assert_str_equals( `echo`, $out );
 }
 
 sub test_executeRSP {

diff --git a/core/lib/Foswiki/Sandbox.pm b/core/lib/Foswiki/Sandbox.pm
@@ -480,7 +480,7 @@ sub sysCommand {
     return '' unless $template;
 
     # Implicit untaint OK; $template is safe
-    $template =~ /(^.*?)\s+(.*)$/;
+    $template =~ /^(.*?)(?:\s+(.*))?$/;
     my $path  = $1;
     my $pTmpl = $2;
     my $cmd;