diff --git a/ChangeLog b/ChangeLog
index 5cfc97867..d196d8849 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* 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  <flachapelle@inverse.ca>
 
 	* 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];