Guard HasAnyEscapeChars() against empty string

ServiceStack · Jan 23, 2019 · 36313cf · 36313cf
1 parent 3b98719
commit 36313cf
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/ServiceStack.Text/CsvWriter.cs b/src/ServiceStack.Text/CsvWriter.cs
@@ -122,9 +122,10 @@ public static class CsvWriter
     {
         public static bool HasAnyEscapeChars(string value)
         {
-            return CsvConfig.EscapeStrings.Any(value.Contains)
-                || value[0] == JsWriter.ListStartChar
-                || value[0] == JsWriter.MapStartChar;
+            return !string.IsNullOrEmpty(value) 
+               && (CsvConfig.EscapeStrings.Any(value.Contains)
+                    || value[0] == JsWriter.ListStartChar
+                    || value[0] == JsWriter.MapStartChar);
         }
 
         internal static void WriteItemSeperatorIfRanOnce(TextWriter writer, ref bool ranOnce)