From 2646e93e5f41b89a67086b3eab52d1d66318fd86 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 8 Nov 2010 18:25:18 +0000 Subject: [PATCH] See Changelog Monotone-Parent: f98db9e0d0c41fc50f243d8f21ff421712d14518 Monotone-Revision: 54b01b70fe55f24f29ed00a93826637acb076c5f Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-11-08T18:25:18 Monotone-Branch: ca.inverse.sogo --- SOPE/NGCards/ChangeLog | 6 ++++++ SOPE/NGCards/NSString+NGCards.m | 13 ++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog index f906ac05a..c3dae2208 100644 --- a/SOPE/NGCards/ChangeLog +++ b/SOPE/NGCards/ChangeLog @@ -1,3 +1,9 @@ +2010-11-08 Francis Lachapelle + + * NSString+NGCards.m (-vCardSubvaluesWithSeparator:): now returns + an empty array when the string is empty, instead of an array with + an empty string. + 2010-10-28 Francis Lachapelle * iCalRecurrenceRule.m (-isInfinite): a repeat count set to 0 is diff --git a/SOPE/NGCards/NSString+NGCards.m b/SOPE/NGCards/NSString+NGCards.m index 30280e7f7..d090bfe00 100644 --- a/SOPE/NGCards/NSString+NGCards.m +++ b/SOPE/NGCards/NSString+NGCards.m @@ -322,11 +322,14 @@ static NSString *commaSeparator = nil; } } - substring = [[NSString alloc] initWithCharactersNoCopy: substringBuffer - length: substringLength - freeWhenDone: YES]; - [components addObject: substring]; - [substring release]; + if (substringLength > 0) + { + substring = [[NSString alloc] initWithCharactersNoCopy: substringBuffer + length: substringLength + freeWhenDone: YES]; + [components addObject: substring]; + [substring release]; + } NSZoneFree (NULL, stringBuffer);