amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-04 12:58:50 +00:00
Code Issues Projects Releases Wiki Activity

fix(calendar): Fix assertion when is_cycle is set but without c_cycleinfo

Browse Source
This commit is contained in:
smizrahi
2024-04-08 13:57:07 +02:00
parent 2f4c125bdd
commit d4046673ee
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
SoObjects/Appointments/SOGoAppointmentFolder.m
View File

@@ -1255,6 +1255,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
NSInteger offset;
id tz;
content = nil;
if ([theRecord objectForKey: @"c_cycleinfo"] && [[theRecord objectForKey: @"c_cycleinfo"] isKindOfClass: [NSData class]]) {
content = [NSString stringWithUTF8String: [[theRecord objectForKey: @"c_cycleinfo"] bytes]];
} else if ([theRecord objectForKey: @"c_cycleinfo"] && [[theRecord objectForKey: @"c_cycleinfo"] isKindOfClass: [NSString class]]) {
@@ -1289,16 +1290,23 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
}
cycleinfo = [content propertyList];
if (!cycleinfo)
if (![content isNotNull])
{
cycleinfo = [content propertyList];
if (!cycleinfo)
{
[self errorWithFormat:@"cyclic record doesn't have cycleinfo -> %@", theRecord];
return;
}
rules = [cycleinfo objectForKey: @"rules"];
exRules = [cycleinfo objectForKey: @"exRules"];
rDates = [cycleinfo objectForKey: @"rDates"];
exDates = [cycleinfo objectForKey: @"exDates"];
} else {
[self errorWithFormat:@"cyclic record doesn't have cycleinfo -> %@", theRecord];
return;
}
rules = [cycleinfo objectForKey: @"rules"];
exRules = [cycleinfo objectForKey: @"exRules"];
rDates = [cycleinfo objectForKey: @"rDates"];
exDates = [cycleinfo objectForKey: @"exDates"];
eventTimeZone = nil;
allDayTimeZone = nil;
tz = nil;