From 851c7fac433e4c5a5ac04398c89480f4500c30a9 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 2 Jun 2008 04:24:36 +0000
Subject: Committing on behalf of  Milan Crha  <mcrha@redhat.com>

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

       ** Fix for bug #535459


svn path=/trunk/; revision=35566
---
 calendar/gui/e-itip-control.c |  8 +++++++-
 calendar/gui/itip-utils.c     | 23 +++++++++++++++++++++++
 calendar/gui/itip-utils.h     |  2 ++
 3 files changed, 32 insertions(+), 1 deletion(-)

(limited to 'calendar/gui')

diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 81a2458106..f574d86b06 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -1676,8 +1676,14 @@ e_itip_control_set_data (EItipControl *itip, const gchar *text)
 	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;
 	}
 
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index e529042051..cddb3d9b4f 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -1666,3 +1666,26 @@ itip_publish_comp (ECal *client, gchar *uri, gchar *username,
 	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);
+}
diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
index e7014c9f47..1e8ebc2849 100644
--- a/calendar/gui/itip-utils.h
+++ b/calendar/gui/itip-utils.h
@@ -51,4 +51,6 @@ gboolean itip_publish_begin (ECalComponent *pub_comp, ECal *client,
 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
-- 
cgit