From 38c31ba2aa0d5e0daf6ec5797f04d007c276db41 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 8 Jan 2010 15:03:02 +0000 Subject: [PATCH] Monotone-Parent: 4db8a709d7b9971ba989f90d459f2e903d8e7d2e Monotone-Revision: 9b3ca8d1aaa3b15df09c58887d1e37a7aa3e21cc Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-01-08T15:03:02 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 7 +++++++ SoObjects/SOGo/NSString+Utilities.m | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5cfc97867..d196d8849 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-01-08 Wolfgang Sourdeau + + * SoObjects/SOGo/NSString+Utilities.m (-_setupCSSEscaping): we + must initialize cssEscapingCount before using it. Also, fixed a + typo preventing the character buffer from being initialized + completely. + 2010-01-07 Francis Lachapelle * SoObjects/SOGo/NSString+Utilities.m (-asCSSIdentifier): replaced diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m index 4c522162d..128159130 100644 --- a/SoObjects/SOGo/NSString+Utilities.m +++ b/SoObjects/SOGo/NSString+Utilities.m @@ -42,7 +42,7 @@ static NSMutableCharacterSet *urlStartChars = nil; static NSString **cssEscapingStrings = NULL; static unichar *cssEscapingCharacters = NULL; -static int cssEscapingCount = 0; +static int cssEscapingCount; @implementation NSString (SOGoURLExtension) @@ -321,9 +321,10 @@ static int cssEscapingCount = 0; characters = [NSArray arrayWithObjects: @"_", @".", @"#", @"@", @"*", @":", @",", @" ", nil]; - cssEscapingCharacters - = NSZoneMalloc (NULL, sizeof ((cssEscapingCount + 1) * sizeof (unichar))); cssEscapingCount = [strings count]; + cssEscapingCharacters = NSZoneMalloc (NULL, + (cssEscapingCount + 1) + * sizeof (unichar)); for (count = 0; count < cssEscapingCount; count++) *(cssEscapingCharacters + count) = [[characters objectAtIndex: count] characterAtIndex: 0];