Merge pull request #891 from Project-MONAI/FixRegex

add timeout to regex
Project-MONAI · Oct 16, 2023 · 66bddaf · 66bddaf
2 parents 94576ce + aa3d0b1
commit 66bddaf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/WorkflowManager/ConditionsResolver/Resovler/Conditional.cs b/src/WorkflowManager/ConditionsResolver/Resovler/Conditional.cs
@@ -92,7 +92,7 @@ public int Parse(ReadOnlySpan<char> input, int currentIndex = 0)
             {
                 var pattern = @"(?i:\bnull\b|''|""""|\bundefined\b)";
                 var replace = NULL;
-                input = Regex.Replace(input.ToString(), pattern, replace, RegexOptions.IgnoreCase);
+                input = Regex.Replace(input.ToString(), pattern, replace, RegexOptions.IgnoreCase, TimeSpan.FromSeconds(1));
             }
 
             if (input.IsEmpty || input.IsWhiteSpace())
@@ -211,7 +211,7 @@ private int ParseChars(ReadOnlySpan<char> input, int currentIndex, char currentC
 
         private int ParseExtendedOperators(ReadOnlySpan<char> input, int currentIndex)
         {
-            var currentWord = Regex.Match(input.ToString(), @"\'\w+\'|^\w+").Value;
+            var currentWord = Regex.Match(input.ToString(), @"\'\w+\'|^\w+", new RegexOptions(), TimeSpan.FromSeconds(1)).Value;
 
             if (currentWord.ToUpper() == CONTAINS && currentIndex != 0)
             {