Changeset 199 for trunk/Packages/VCard/VCard.pas

Timestamp:

Jan 28, 2026, 10:24:15 AM (5 hours ago)

Author:

chronos

Message:

• Fixed: Handling escaped semicolon in indexed property values.

File:

• trunk/Packages/VCard/VCard.pas (modified) (2 diffs)

trunk/Packages/VCard/VCard.pas

@@ -858 +858 @@
 function TContactProperty.GetValueItem(Index: Integer): string;
 var
-  List: TStringList;
-begin
-  List := TStringList.Create;
-  try
-    List.Delimiter := ';';
-    List.NameValueSeparator := '=';
-    List.StrictDelimiter := True;
-    List.DelimitedText := Value;
-    if Index < List.Count then
-      Result := List.Strings[Index]
-      else Result := '';
-  finally
-    List.Free;
-  end;
+  I: Integer;
+  P: Integer;
+  CurrentIndex: Integer;
+  CurrentIndexStart: Integer;
+  CurrentIndexEnd: Integer;
+begin
+  CurrentIndex := 0;
+  CurrentIndexStart := 1;
+  CurrentIndexEnd := Length(Value);
+  P := 1;
+  repeat
+    I := Pos(';', Value, P);
+    if I > 0 then begin
+      if (I > 1) and (Value[I - 1] = '\') then begin
+        P := I + 1;
+        Continue;
+      end else begin
+        CurrentIndexEnd := I - 1;
+        if CurrentIndex = Index then begin
+          Break;
+        end else begin
+          P := I + 1;
+          Inc(CurrentIndex);
+          CurrentIndexStart := P;
+          CurrentIndexEnd := Length(Value);
+        end;
+      end;
+    end else begin
+      Break;
+    end;
+  until False;
+  if Index = CurrentIndex then begin
+    Result := Copy(Value, CurrentIndexStart, CurrentIndexEnd - CurrentIndexStart + 1);
+  end else Result := '';
 end;
 
@@ -895 +915 @@
 procedure TContactProperty.SetValueItem(Index: Integer; AValue: string);
 var
-  List: TStringList;
-begin
-  List := TStringList.Create;
-  try
-    List.Delimiter := ';';
-    List.NameValueSeparator := '=';
-    List.StrictDelimiter := True;
-    List.DelimitedText := Value;
-
-    // Extend subitems count
-    while List.Count <= Index do
-      List.Add('');
-
-    List.Strings[Index] := AValue;
-
-    // Remove empty items
-    while (List.Count > 0) and (List.Strings[List.Count - 1] = '') do
-      List.Delete(List.Count - 1);
-
-    Value := List.DelimitedText;
-  finally
-    List.Free;
+  I: Integer;
+  P: Integer;
+  CurrentIndex: Integer;
+  CurrentIndexStart: Integer;
+  CurrentIndexEnd: Integer;
+begin
+  CurrentIndex := 0;
+  CurrentIndexStart := 1;
+  CurrentIndexEnd := Length(Value);
+  P := 1;
+  repeat
+    I := Pos(';', Value, P);
+    if I > 0 then begin
+      if (I > 1) and (Value[I - 1] = '\') then begin
+        P := I + 1;
+        Continue;
+      end else begin
+        CurrentIndexEnd := I - 1;
+        if CurrentIndex = Index then begin
+          Break;
+        end else begin
+          P := I + 1;
+          Inc(CurrentIndex);
+          CurrentIndexStart := P;
+          CurrentIndexEnd := Length(Value);
+        end;
+      end;
+    end else begin
+      Break;
+    end;
+  until False;
+  if Index = CurrentIndex then begin
+    Value := Copy(Value, 1, CurrentIndexStart - 1) +
+      AValue + Copy(Value, CurrentIndexEnd + 1, MaxInt);
+  end else begin
+    for I := CurrentIndex + 1 to Index do begin
+      Value := Value + ';';
+      if I = Index then Value := Value + AValue;
+    end;
   end;
 end;