diff options
| author | Milan Crha <mcrha@redhat.com> | 2011-08-18 23:29:42 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2011-08-18 23:29:42 +0800 |
| commit | 59c61f49856291cc6cfd821533da16848d4a1e06 (patch) | |
| tree | 11441376d165231e0ef55c0e28a0a9e6b093b418 | |
| parent | cfd3c3116ba35950497d24eedb28bd7064fb459a (diff) | |
| download | gsoc2013-evolution-59c61f49856291cc6cfd821533da16848d4a1e06.tar gsoc2013-evolution-59c61f49856291cc6cfd821533da16848d4a1e06.tar.gz gsoc2013-evolution-59c61f49856291cc6cfd821533da16848d4a1e06.tar.bz2 gsoc2013-evolution-59c61f49856291cc6cfd821533da16848d4a1e06.tar.lz gsoc2013-evolution-59c61f49856291cc6cfd821533da16848d4a1e06.tar.xz gsoc2013-evolution-59c61f49856291cc6cfd821533da16848d4a1e06.tar.zst gsoc2013-evolution-59c61f49856291cc6cfd821533da16848d4a1e06.zip | |
Bug #656810 - Too strict checking for validity of received calendars
| -rw-r--r-- | calendar/gui/itip-utils.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 02042d29a9..19f01614c6 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -2026,8 +2026,22 @@ check_time (const struct icaltimetype tmval, gboolean is_icalcomp_valid (icalcomponent *icalcomp) { - return icalcomp && - icalcomponent_is_valid (icalcomp) && - check_time (icalcomponent_get_dtstart (icalcomp), FALSE) && - check_time (icalcomponent_get_dtend (icalcomp), TRUE); + if (!icalcomp || !icalcomponent_is_valid (icalcomp)) + return FALSE; + + switch (icalcomponent_isa (icalcomp)) { + case ICAL_VEVENT_COMPONENT: + return check_time (icalcomponent_get_dtstart (icalcomp), FALSE) && + check_time (icalcomponent_get_dtend (icalcomp), TRUE); + case ICAL_VTODO_COMPONENT: + return check_time (icalcomponent_get_dtstart (icalcomp), TRUE) && + check_time (icalcomponent_get_due (icalcomp), TRUE); + case ICAL_VJOURNAL_COMPONENT: + return check_time (icalcomponent_get_dtstart (icalcomp), TRUE) && + check_time (icalcomponent_get_dtend (icalcomp), TRUE); + default: + break; + } + + return TRUE; } |