fixed merge

4 years ago · 41246909dc
parent f8b717e7c5
commit 41246909dc
1 changed files with 9 additions and 1 deletions
--- 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)