evolution r35566 - in trunk: calendar calendar/gui plugins/itip-formatter

[abharath svn gnome org]

Author: abharath
Date: Mon Jun  2 04:24:36 2008
New Revision: 35566
URL: http://svn.gnome.org/viewvc/evolution?rev=35566&view=rev

Log:
Committing on behalf of  Milan Crha  <mcrha redhat com>

2008-05-29  Milan Crha  <mcrha redhat com>

       ** Fix for bug #535459



Modified:
   trunk/calendar/ChangeLog
   trunk/calendar/gui/e-itip-control.c
   trunk/calendar/gui/itip-utils.c
   trunk/calendar/gui/itip-utils.h
   trunk/plugins/itip-formatter/ChangeLog
   trunk/plugins/itip-formatter/itip-formatter.c

Modified: trunk/calendar/gui/e-itip-control.c
==============================================================================
--- trunk/calendar/gui/e-itip-control.c	(original)
+++ trunk/calendar/gui/e-itip-control.c	Mon Jun  2 04:24:36 2008
@@ -1676,8 +1676,14 @@
 	priv->top_level = e_cal_util_new_top_level ();
 
 	priv->main_comp = icalparser_parse_string (priv->vcalendar);
-	if (priv->main_comp == NULL) {
+	if (priv->main_comp == NULL || !is_icalcomp_valid (priv->main_comp)) {
 		write_error_html (itip, _("The attachment does not contain a valid calendar message"));
+
+		if (priv->main_comp) {
+			icalcomponent_free (priv->main_comp);
+			priv->main_comp = NULL;
+		}
+
 		return;
 	}
 

Modified: trunk/calendar/gui/itip-utils.c
==============================================================================
--- trunk/calendar/gui/itip-utils.c	(original)
+++ trunk/calendar/gui/itip-utils.c	Mon Jun  2 04:24:36 2008
@@ -1666,3 +1666,26 @@
 	return TRUE;
 }
 
+static gboolean
+check_time (const struct icaltimetype tmval, gboolean can_null_time)
+{
+	if (icaltime_is_null_time (tmval))
+		return can_null_time;
+
+	return  icaltime_is_valid_time (tmval) &&
+		tmval.month >= 1 && tmval.month <= 12 &&
+		tmval.day >= 1 && tmval.day <= 31 &&
+		tmval.hour >= 0 && tmval.hour < 24 &&
+		tmval.minute >= 0 && tmval.minute < 60 &&
+		tmval.second >= 0 && tmval.second < 60;
+}
+
+/* returns whether the passed-in icalcomponent is valid or not. It does some sanity checks on values too. */
+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);
+}

Modified: trunk/calendar/gui/itip-utils.h
==============================================================================
--- trunk/calendar/gui/itip-utils.h	(original)
+++ trunk/calendar/gui/itip-utils.h	Mon Jun  2 04:24:36 2008
@@ -51,4 +51,6 @@
 gboolean reply_to_calendar_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
 				ECal *client, gboolean reply_all, icalcomponent *zones, GSList *attachments_list);
 
+gboolean is_icalcomp_valid (icalcomponent *icalcomp);
+
 #endif

Modified: trunk/plugins/itip-formatter/itip-formatter.c
==============================================================================
--- trunk/plugins/itip-formatter/itip-formatter.c	(original)
+++ trunk/plugins/itip-formatter/itip-formatter.c	Mon Jun  2 04:24:36 2008
@@ -1372,11 +1372,16 @@
 	pitip->top_level = e_cal_util_new_top_level ();
 
 	pitip->main_comp = icalparser_parse_string (pitip->vcalendar);
-	if (pitip->main_comp == NULL) {
+	if (pitip->main_comp == NULL || !is_icalcomp_valid (pitip->main_comp)) {
 		set_itip_error (pitip, container,
 				_("The calendar attached is not valid"),
 				_("The message claims to contain a calendar, but the calendar is not a valid iCalendar."));
 
+		if (pitip->main_comp) {
+			icalcomponent_free (pitip->main_comp);
+			pitip->main_comp = NULL;
+		}
+
 		return FALSE;
 	}
 
@@ -1849,7 +1854,6 @@
 	return FALSE;
 }
 
-
 static gboolean
 in_proper_folder (CamelFolder *folder)
 {