amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-19 02:15:36 +00:00
Code Issues Projects Releases Wiki Activity

fix(core): don't remove double quotes when parsing versit strings

Browse Source 
Fixes #3530
Fixes #3930
This commit is contained in:
Francis Lachapelle
2022-06-29 16:58:28 -04:00
parent ebf032ee6b
commit 6bed6c0e20
3 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SOPE/NGCards/NSDictionary+NGCards.m
+1 -1
View File
@@ -59,7 +59,7 @@
&& ![subValue hasSuffix: @"\""])
subValue = [NSString stringWithFormat: @"\"%@\"", subValue];
escaped = [subValue escapedForCards];
escaped = [subValue escapedForCardsAsAttributes: asAttributes];
if ([escaped length] > 0)
{
[aString appendString: escaped];
SOPE/NGCards/NSString+NGCards.h
+1 -1
View File
@@ -34,7 +34,7 @@
- (NSString *) foldedForVersitCards;
- (NSArray *) asCardAttributeValues;
- (NSString *) escapedForCards;
- (NSString *) escapedForCardsAsAttributes: (BOOL) asAttributes;
- (NSString *) rfc822Email;
- (NSTimeInterval) durationAsTimeInterval;
SOPE/NGCards/NSString+NGCards.m
+37 -29
View File
@@ -69,7 +69,7 @@
NSString *newString;
unichar *characters, *currentChar, *lastChar, *newPart, *newCurrentChar;
NSUInteger max;
BOOL isEscaped;
BOOL isEscaped, isQuoted;
values = [NSMutableArray array];
@@ -83,10 +83,23 @@
newCurrentChar = newPart;
isEscaped = NO;
isQuoted = (max > 1 && [self hasPrefix: @"\""] && [self hasSuffix: @"\""]);
if (isQuoted)
{
// Remove leading and trailing quotes
currentChar++;
lastChar--;
}
while (currentChar < lastChar)
{
if (isEscaped)
if (isQuoted)
{
// Don't escape characters
*newCurrentChar = *currentChar;
newCurrentChar++;
}
else if (isEscaped)
{
if (*currentChar == 'n' || *currentChar == 'N')
*newCurrentChar = '\n';
@@ -107,10 +120,10 @@
isEscaped = YES;
else if (*currentChar == ',')
{
newString = [[NSString alloc]
initWithCharactersNoCopy: newPart
length: (newCurrentChar - newPart)
freeWhenDone: YES];
// The comma is a value delimiter
newString = [[NSString alloc] initWithCharactersNoCopy: newPart
length: (newCurrentChar - newPart)
freeWhenDone: YES];
[values addObject: newString];
[newString release];
newPart = NSZoneMalloc (NULL, max * sizeof (unichar));
@@ -125,10 +138,9 @@
currentChar++;
}
newString = [[NSString alloc]
initWithCharactersNoCopy: newPart
length: (newCurrentChar - newPart)
freeWhenDone: YES];
newString = [[NSString alloc] initWithCharactersNoCopy: newPart
length: (newCurrentChar - newPart)
freeWhenDone: YES];
[values addObject: newString];
[newString release];
@@ -137,7 +149,7 @@
return values;
}
- (NSString *) escapedForCards
- (NSString *) escapedForCardsAsAttributes: (BOOL) asAttributes
{
NSMutableString *string;
unsigned int len, i;
@@ -152,33 +164,29 @@
{
c = [self characterAtIndex: i];
if (isQuoted)
{
if (c == '"')
isQuoted = NO;
[string appendFormat: @"%C", c];
continue;
}
if (!isQuoted || !asAttributes)
switch (c)
{
case ',':
[string appendString: @"\\,"];
continue;
//case ':':
// [string appendString: @"\\:"];
//break;
case ';':
[string appendString: @"\\;"];
continue;
}
switch (c)
{
case '"':
isQuoted = YES;
isQuoted = !isQuoted;
[string appendFormat: @"%C", c];
break;
case '\\':
[string appendString: @"\\\\"];
break;
case ',':
[string appendString: @"\\,"];
break;
//case ':':
// [string appendString: @"\\:"];
//break;
case ';':
[string appendString: @"\\;"];
break;
case'\n':
[string appendString: @"\\n"];
break;