Fix NRE when MatchEvaluator returns null (dotnet#39779)

* Fix NRE when MatchEvaluator returns null * Update Regex.Replace.Tests.cs * Use fancy syntax
almaleksia · Jul 26, 2019 · 9822759 · 9822759
1 parent 58a4d24
commit 9822759
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Replace.cs b/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Replace.cs
@@ -186,7 +186,7 @@ private static string Replace(MatchEvaluator evaluator, Regex regex, string inpu
                             vsb.Append(input.AsSpan(prevat, match.Index - prevat));
 
                         prevat = match.Index + match.Length;
-                        vsb.Append(evaluator(match));
+                        vsb.Append(evaluator(match) ?? "");
 
                         if (--count == 0)
                             break;

diff --git a/src/System.Text.RegularExpressions/tests/Regex.Replace.Tests.cs b/src/System.Text.RegularExpressions/tests/Regex.Replace.Tests.cs
@@ -224,6 +224,25 @@ public void Replace_NoMatch()
             Assert.Same(input, Regex.Replace(input, "no-match", new MatchEvaluator(MatchEvaluator1)));
         }
 
+        [Theory]
+        [InlineData(RegexOptions.None)]
+        [InlineData(RegexOptions.RightToLeft)]
+        public void Replace_MatchEvaluatorReturnsNullOrEmpty(RegexOptions options)
+        {
+            string result = Regex.Replace("abcde", @"[abcd]", (Match match) => {
+                return match.Value switch
+                {
+                    "a" => "x",
+                    "b" => null,
+                    "c" => "",
+                    "d" => "y",
+                    _ => throw new InvalidOperationException()
+                };
+            }, options);
+
+            Assert.Equal("xye", result);
+        }
+
         [Fact]
         public void Replace_Invalid()
         {