See Changelog.

Monotone-Parent: 4e80269c9a4c19167cb40423b5d143cad86c7adf
Monotone-Revision: 4dce7f2bb0060199c33ebafe2626104c2cc729ec

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-02-22T20:29:04
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2011-02-22 20:29:04 +00:00
parent a015307d4e
commit 22292839bc
2 changed files with 21 additions and 8 deletions

View File

@ -1,3 +1,10 @@
2011-02-22 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Scheduler/UIxCalListingActions.m (
-_fillBlocks:withEvent:withNumber:): don't compute the block if
the end date is before the start date. This fixes a rare segfault that
occurs with recurrent event with multiple exceptions.
2011-02-17 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Contacts/SOGoFolder+CardDAV.m (-parseContactFilter:):

View File

@ -728,14 +728,20 @@ _userStateInEvent (NSArray *event)
offset++;
currentDay = [blocks objectAtIndex: offset];
}
eventBlock = [self _eventBlockWithStart: currentStart
end: eventEnd
number: number
onDay: currentDayStart
recurrenceTime: recurrenceTime
userState: userState];
[currentDay addObject: eventBlock];
}
if (eventEnd > currentStart)
{
eventBlock = [self _eventBlockWithStart: currentStart
end: eventEnd
number: number
onDay: currentDayStart
recurrenceTime: recurrenceTime
userState: userState];
[currentDay addObject: eventBlock];
}
else
[self warnWithFormat: @"event '%@' has end < start: %d < %d",
[event objectAtIndex: eventNameIndex], eventEnd, currentStart];
}
}
}
}