Fixed exception when quotes are used in a filter query

microsoft · May 28, 2024 · 33241b5 · 33241b5
1 parent 2821149
commit 33241b5
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/EventLogExpert.UI/FilterMethods.cs b/src/EventLogExpert.UI/FilterMethods.cs
@@ -161,23 +161,23 @@ public static bool TryParse(FilterModel filterModel, out string comparison)
             case FilterEvaluator.NotEqual:
                 if (filterModel.Data.Category is FilterCategory.KeywordsDisplayNames)
                 {
-                    stringBuilder.Append($"\"{filterModel.Data.Value}\", StringComparison.OrdinalIgnoreCase))");
+                    stringBuilder.Append($"\"{filterModel.Data.Value?.Replace("\"", "\'")}\", StringComparison.OrdinalIgnoreCase))");
                 }
                 else
                 {
-                    stringBuilder.Append($"\"{filterModel.Data.Value}\"");
+                    stringBuilder.Append($"\"{filterModel.Data.Value?.Replace("\"", "\'")}\"");
                 }
 
                 break;
             case FilterEvaluator.Contains:
             case FilterEvaluator.NotContains:
                 if (filterModel.Data.Category is FilterCategory.KeywordsDisplayNames)
                 {
-                    stringBuilder.Append($"(\"{filterModel.Data.Value}\", StringComparison.OrdinalIgnoreCase))");
+                    stringBuilder.Append($"(\"{filterModel.Data.Value?.Replace("\"", "\'")}\", StringComparison.OrdinalIgnoreCase))");
                 }
                 else
                 {
-                    stringBuilder.Append($"(\"{filterModel.Data.Value}\", StringComparison.OrdinalIgnoreCase)");
+                    stringBuilder.Append($"(\"{filterModel.Data.Value?.Replace("\"", "\'")}\", StringComparison.OrdinalIgnoreCase)");
                 }
 
                 break;
@@ -286,23 +286,23 @@ public static bool TryParseExpression(string? expression, out string error)
             case FilterEvaluator.NotEqual:
                 if (subFilter.Data.Category is FilterCategory.KeywordsDisplayNames)
                 {
-                    stringBuilder.Append($"\"{subFilter.Data.Value}\", StringComparison.OrdinalIgnoreCase))");
+                    stringBuilder.Append($"\"{subFilter.Data.Value?.Replace("\"", "\\\"")}\", StringComparison.OrdinalIgnoreCase))");
                 }
                 else
                 {
-                    stringBuilder.Append($"\"{subFilter.Data.Value}\"");
+                    stringBuilder.Append($"\"{subFilter.Data.Value?.Replace("\"", "\\\"")}\"");
                 }
 
                 break;
             case FilterEvaluator.Contains:
             case FilterEvaluator.NotContains:
                 if (subFilter.Data.Category is FilterCategory.KeywordsDisplayNames)
                 {
-                    stringBuilder.Append($"(\"{subFilter.Data.Value}\", StringComparison.OrdinalIgnoreCase))");
+                    stringBuilder.Append($"(\"{subFilter.Data.Value?.Replace("\"", "\'")}\", StringComparison.OrdinalIgnoreCase))");
                 }
                 else
                 {
-                    stringBuilder.Append($"(\"{subFilter.Data.Value}\", StringComparison.OrdinalIgnoreCase)");
+                    stringBuilder.Append($"(\"{subFilter.Data.Value?.Replace("\"", "\'")}\", StringComparison.OrdinalIgnoreCase)");
                 }
 
                 break;