Monotone-Parent: 300b960b99af9d890f03b4a72f3a63164c19b44c

Monotone-Revision: eba51f48761a50897d61f4fffe1e4122f78c7a2d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-07-03T19:46:01
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,9 @@
 2009-07-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxCalListingActions.m (-eventsBlocksAction): added
+	sanity checks to avoid crashes when quick fields were wrongly
+	parsed.
+
 	* SoObjects/SOGo/LDAPUserManager.m (_fillContactMailRecords:): if
 	the user uid contains a "@", we set it directly as system email
 	rather than suffixing it with the default mail domain.

NEWS

@@ -9,6 +9,9 @@
 - improved the attendees modification dialog by implementing slots management and zooming
 - added the capability to display the size of messages in the mail module
 - added the capability of limiting the number of returned events from DAV requests
+- added support for Cyrus Daboo's Webdav sync draft spec in the calendar and addressbook collections
+- added unicode support in the IMAP folder names
+- fixed some issues with the conversion of folder names in modified UTF-7
 
 1.0-20090605 (1.0.2)
 --------------------

UI/Scheduler/UIxCalListingActions.m

@@ -37,6 +37,7 @@
 
 #import <NGExtensions/NGCalendarDateRange.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
 
 #import <SoObjects/SOGo/SOGoDateFormatter.h>
 #import <SoObjects/SOGo/SOGoUser.h>
@@ -591,16 +592,30 @@ _userStateInEvent (NSArray *event)
 	   withEvent: (NSArray *) event
 	  withNumber: (NSNumber *) number
 {
-  unsigned int currentDayStart, startSecs, endsSecs, currentStart, eventStart,
+  int currentDayStart, startSecs, endsSecs, currentStart, eventStart,
     eventEnd, offset, recurrenceTime;
   NSMutableArray *currentDay;
   NSMutableDictionary *eventBlock;
   iCalPersonPartStat userState;
 
+  eventStart = [[event objectAtIndex: 4] intValue];
+  if (eventStart < 0)
+    [self errorWithFormat: @"event '%@' has negative start: %d (skipped)",
+          [event objectAtIndex: 0], eventStart];
+  else
+    {
+      eventEnd = [[event objectAtIndex: 5] intValue];
+      if (eventEnd < 0)
+        [self errorWithFormat: @"event '%@' has negative end: %d (skipped)",
+              [event objectAtIndex: 0], eventEnd];
+      else
+        {
+          if (eventEnd < eventStart)
+            [self warnWithFormat: @"event '%@' has end < start: %d < %d",
+                  [event objectAtIndex: 0], eventEnd, eventStart];
+
           startSecs = (unsigned int) [startDate timeIntervalSince1970];
           endsSecs = (unsigned int) [endDate timeIntervalSince1970];
-  eventStart = [[event objectAtIndex: 4] unsignedIntValue];
-  eventEnd = [[event objectAtIndex: 5] unsignedIntValue];
 
           if ([[event objectAtIndex: 12] boolValue]) // c_iscycle
             recurrenceTime = [[event objectAtIndex: 14] unsignedIntValue]; // c_recurrence_id
@@ -616,6 +631,12 @@ _userStateInEvent (NSArray *event)
           else
             offset = ((currentStart - startSecs)
                       / dayLength);
+          if (offset >= [blocks count])
+            [self errorWithFormat: "event '%@' has a computed offset that"
+                  @" overflows the amount of blocks (skipped)",
+                  [event objectAtIndex: 0]];
+          else
+            {
               currentDay = [blocks objectAtIndex: offset];
               currentDayStart = startSecs + dayLength * offset;
 
@@ -644,6 +665,9 @@ _userStateInEvent (NSArray *event)
                                        recurrenceTime: recurrenceTime
                                             userState: userState];
               [currentDay addObject: eventBlock];
+            }
+        }
+    }
 }
 
 - (void) _prepareEventBlocks: (NSMutableArray **) blocks