From 41246909dcbf71a85140b5354e5f76e33ea4801e Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Tue, 20 Apr 2021 18:14:23 +0100
Subject: [PATCH] fixed merge

---
 Emby.Dlna/DlnaManager.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Emby.Dlna/DlnaManager.cs b/Emby.Dlna/DlnaManager.cs
index 8aed4a50fa..a554a4d5b7 100644
--- a/Emby.Dlna/DlnaManager.cs
+++ b/Emby.Dlna/DlnaManager.cs
@@ -173,8 +173,16 @@ namespace Emby.Dlna
                 return false;
             }
 
-            return input.Equals(pattern, StringComparison.OrdinalIgnoreCase)
+            try
+            {
+                return input.Equals(pattern, StringComparison.OrdinalIgnoreCase)
                 || Regex.IsMatch(input, pattern, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
+            }
+            catch (ArgumentException ex)
+            {
+                _logger.LogError(ex, "Error evaluating regex pattern {Pattern}", pattern);
+                return false;
+            }
         }
 
         public DeviceProfile GetProfile(IHeaderDictionary headers)