Item15192: improved fix to $EVAL()

foswiki · May 17, 2023 · 82cbc46 · 82cbc46
1 parent c8c592a
commit 82cbc46
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/SpreadSheetPlugin/lib/Foswiki/Plugins/SpreadSheetPlugin/Calc.pm b/SpreadSheetPlugin/lib/Foswiki/Plugins/SpreadSheetPlugin/Calc.pm
@@ -1733,6 +1733,7 @@ sub _safeEvalPerl {
     # disable glob for security reasons
     $theText =~ s/^([\(\s]*)\<+/$1/g;
     $theText =~ s/\>+([\s\)]*)$/$1/g;
+    $theText =~ s/\<\s*\>/ /g;
 
     # remove leading 0s to defuse interpretation of numbers as octals
     $theText =~ s/(^|[^\.])\b0+(?=[0-9])/$1/g;

diff --git a/SpreadSheetPlugin/test/unit/SpreadSheetPlugin/SpreadSheetPluginTests.pm b/SpreadSheetPlugin/test/unit/SpreadSheetPlugin/SpreadSheetPluginTests.pm
@@ -441,6 +441,9 @@ sub test_EVAL_GLOB {
     $this->assert( $this->CALC('$EVAL((<*>))')             =~ /^ERROR:/ );
     $this->assert( $this->CALC('$EVAL(< * >)')             =~ /^ERROR:/ );
     $this->assert( $this->CALC('$EVAL(<../../../ee*/* >)') =~ /^ERROR:/ );
+    $this->assert( $this->CALC('$EVAL(<>)') == 0 );
+    $this->assert( $this->CALC('$EVAL(2+<>+2)') == 4 );
+    $this->assert( $this->CALC('$EVAL(2+<   >+2)') == 4 );
 }
 
 sub test_EVEN {