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

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

Browse Source 
Fixes #3530
This commit is contained in:
Francis Lachapelle
2022-06-28 16:54:41 -04:00
parent 9fb3705005
commit d99aa82a31
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SOPE/NGCards/NSString+NGCards.m
+3 -15
View File
@@ -69,7 +69,7 @@
NSString *newString; NSString *newString;
unichar *characters, *currentChar, *lastChar, *newPart, *newCurrentChar; unichar *characters, *currentChar, *lastChar, *newPart, *newCurrentChar;
NSUInteger max; NSUInteger max;
BOOL isEscaped, isQuoted; BOOL isEscaped;
values = [NSMutableArray array]; values = [NSMutableArray array];
@@ -87,17 +87,7 @@
while (currentChar < lastChar) while (currentChar < lastChar)
{ {
if (isQuoted) if (isEscaped)
{
if (*currentChar == '"')
isQuoted = NO;
else
{
*newCurrentChar = *currentChar;
newCurrentChar++;
}
}
else if (isEscaped)
{ {
if (*currentChar == 'n' || *currentChar == 'N') if (*currentChar == 'n' || *currentChar == 'N')
*newCurrentChar = '\n'; *newCurrentChar = '\n';
@@ -114,9 +104,7 @@
} }
else else
{ {
if (*currentChar == '"') if (*currentChar == '\\')
isQuoted = YES;
else if (*currentChar == '\\')
isEscaped = YES; isEscaped = YES;
else if (*currentChar == ',') else if (*currentChar == ',')
{ {
SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m
+1 -1
View File
@@ -837,7 +837,7 @@ static NSCharacterSet *whitespaceCharSet = nil;
/* a regular content tag */ /* a regular content tag */
/* /*
check whether the tga value is encoded in quoted printable, check whether the tag value is encoded in quoted printable,
this one is used with Outlook vCards (see data/ for examples) this one is used with Outlook vCards (see data/ for examples)
*/ */
// TODO: make the encoding check more generic // TODO: make the encoding check more generic