From 324b301d402c0e2330f33a7cd60e34e54336cef0 Mon Sep 17 00:00:00 2001
From: tony <tony.newell@pobox.com>
Date: Wed, 27 Mar 2024 12:14:10 +0000
Subject: [PATCH] Handle regex timeout in grpc.tools

---
 src/csharp/Grpc.Tools/ProtoCompile.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/csharp/Grpc.Tools/ProtoCompile.cs b/src/csharp/Grpc.Tools/ProtoCompile.cs
index ef199f6c981..8dd82b1cc44 100644
--- a/src/csharp/Grpc.Tools/ProtoCompile.cs
+++ b/src/csharp/Grpc.Tools/ProtoCompile.cs
@@ -126,7 +126,7 @@ namespace Grpc.Tools
                                                         "javanano", "js", "objc",
                                                         "php", "python", "ruby" };
 
-        static readonly TimeSpan s_regexTimeout = TimeSpan.FromMilliseconds(100);
+        static readonly TimeSpan s_regexTimeout = TimeSpan.FromSeconds(1);
 
         static readonly List<ErrorListFilter> s_errorListFilters = new List<ErrorListFilter>()
         {
@@ -591,12 +591,18 @@ namespace Grpc.Tools
         {
             foreach (ErrorListFilter filter in s_errorListFilters)
             {
-                Match match = filter.Pattern.Match(singleLine);
+                try
+                {
+                    Match match = filter.Pattern.Match(singleLine);
 
-                if (match.Success)
+                    if (match.Success)
+                    {
+                        filter.LogAction(Log, match);
+                        return;
+                    }
+                } catch (RegexMatchTimeoutException)
                 {
-                    filter.LogAction(Log, match);
-                    return;
+                    Log.LogWarning("Unable to parse output from protoc. Regex timeout.");
                 }
             }