imp - Handle missing argument delimiter cases

--- Instead of a cryptic index out of bounds exception, we should print a helpful error message that says that the line must contain an argument delimiter when there is none. --- Type: imp Breaking: False Doc Required: False Backport Required: False Part: 1/1
Aptivi · Sep 3, 2024 · 8dd463c · 8dd463c
1 parent 9a0e2d7
commit 8dd463c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/VisualCard.Calendar/Parsers/VCalendarParser.cs b/VisualCard.Calendar/Parsers/VCalendarParser.cs
@@ -103,19 +103,20 @@ public Parts.Calendar Parse()
                     valueBuilder.Clear();
                 }
 
-                // Variables
-                string value = _value.Substring(_value.IndexOf(VCalendarConstants._argumentDelimiter) + 1);
-                string prefixWithArgs = _value.Substring(0, _value.IndexOf(VCalendarConstants._argumentDelimiter));
-                string prefix = prefixWithArgs.Contains(';') ? prefixWithArgs.Substring(0, prefixWithArgs.IndexOf(';')) : prefixWithArgs;
-                string args = prefixWithArgs.Contains(';') ? prefixWithArgs.Substring(prefix.Length + 1) : "";
-                string[] splitArgs = args.Split([VCalendarConstants._fieldDelimiter], StringSplitOptions.RemoveEmptyEntries);
-                string[] splitValues = value.Split([VCalendarConstants._fieldDelimiter], StringSplitOptions.RemoveEmptyEntries);
-                bool isWithType = splitArgs.Length > 0;
-                List<string> finalArgs = [];
-
-                // Now, parse a line
                 try
                 {
+                    // Now, parse a line
+                    if (!_value.Contains(VCalendarConstants._argumentDelimiter))
+                        throw new ArgumentException("The line must contain an argument delimiter.");
+                    string value = _value.Substring(_value.IndexOf(VCalendarConstants._argumentDelimiter) + 1);
+                    string prefixWithArgs = _value.Substring(0, _value.IndexOf(VCalendarConstants._argumentDelimiter));
+                    string prefix = prefixWithArgs.Contains(';') ? prefixWithArgs.Substring(0, prefixWithArgs.IndexOf(';')) : prefixWithArgs;
+                    string args = prefixWithArgs.Contains(';') ? prefixWithArgs.Substring(prefix.Length + 1) : "";
+                    string[] splitArgs = args.Split([VCalendarConstants._fieldDelimiter], StringSplitOptions.RemoveEmptyEntries);
+                    string[] splitValues = value.Split([VCalendarConstants._fieldDelimiter], StringSplitOptions.RemoveEmptyEntries);
+                    bool isWithType = splitArgs.Length > 0;
+                    List<string> finalArgs = [];
+
                     // Check to see if we have a BEGIN or an END prefix
                     if (prefix == VCalendarConstants._beginSpecifier)
                     {

diff --git a/VisualCard/Parsers/VcardParser.cs b/VisualCard/Parsers/VcardParser.cs
@@ -96,20 +96,21 @@ public Card Parse()
                     valueBuilder.Clear();
                 }
 
-                // Variables
-                string value = _value.Substring(_value.IndexOf(VcardConstants._argumentDelimiter) + 1);
-                string prefixWithArgs = _value.Substring(0, _value.IndexOf(VcardConstants._argumentDelimiter));
-                string prefix = prefixWithArgs.Contains(';') ? prefixWithArgs.Substring(0, prefixWithArgs.IndexOf(';')) : prefixWithArgs;
-                string args = prefixWithArgs.Contains(';') ? prefixWithArgs.Substring(prefix.Length + 1) : "";
-                string[] splitArgs = args.Split([VcardConstants._fieldDelimiter], StringSplitOptions.RemoveEmptyEntries);
-                string[] splitValues = value.Split([VcardConstants._fieldDelimiter], StringSplitOptions.RemoveEmptyEntries);
-                bool isWithType = splitArgs.Length > 0;
-                List<string> finalArgs = [];
-                int altId = -1;
-
-                // Now, parse a line
                 try
                 {
+                    // Now, parse a line
+                    if (!_value.Contains(VcardConstants._argumentDelimiter))
+                        throw new ArgumentException("The line must contain an argument delimiter.");
+                    string value = _value.Substring(_value.IndexOf(VcardConstants._argumentDelimiter) + 1);
+                    string prefixWithArgs = _value.Substring(0, _value.IndexOf(VcardConstants._argumentDelimiter));
+                    string prefix = prefixWithArgs.Contains(';') ? prefixWithArgs.Substring(0, prefixWithArgs.IndexOf(';')) : prefixWithArgs;
+                    string args = prefixWithArgs.Contains(';') ? prefixWithArgs.Substring(prefix.Length + 1) : "";
+                    string[] splitArgs = args.Split([VcardConstants._fieldDelimiter], StringSplitOptions.RemoveEmptyEntries);
+                    string[] splitValues = value.Split([VcardConstants._fieldDelimiter], StringSplitOptions.RemoveEmptyEntries);
+                    bool isWithType = splitArgs.Length > 0;
+                    List<string> finalArgs = [];
+                    int altId = -1;
+
                     // Get the part type
                     bool xNonstandard = prefix.StartsWith(VcardConstants._xSpecifier);
                     bool specifierRequired = CardVersion.Major >= 3;