Skip to content

Commit

Permalink
fix(calendar): Fix assertion when is_cycle is set but without c_cycle…
Browse files Browse the repository at this point in the history
…info. Fixes #5950.
  • Loading branch information
WoodySlum committed Apr 10, 2024
1 parent 526aa28 commit d9ee884
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions SoObjects/Appointments/SOGoAppointmentFolder.m
Expand Up @@ -1289,21 +1289,20 @@ - (void) flattenCycleRecord: (NSDictionary *) theRecord
return;
}


if (![content isNotNull])
if (nil != content)
{
cycleinfo = [content propertyList];
if (!cycleinfo)
{
[self errorWithFormat:@"cyclic record doesn't have cycleinfo -> %@", theRecord];
[self errorWithFormat:@"cyclic record doesn't have cycleinfo -> %@, %@", theRecord, content];
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];
[self warnWithFormat:@"record has no valid content -> %@, %@", theRecord, content];
}

eventTimeZone = nil;
Expand Down

0 comments on commit d9ee884

Please sign in to comment.