[Commits] [SCM] claws branch, master, updated. 3.10.0-40-g77f99ee

mones at claws-mail.org mones at claws-mail.org
Tue Jun 3 23:52:53 CEST 2014


The branch master of project "claws" (Claws Mail) has been updated
       via  77f99ee3a2df392483b069b523d0024ac271d5fd (commit)
      from  f9985ae65ffaad270013e2ecb618e4556a4411e3 (commit)


- Log -----------------------------------------------------------------
commit 77f99ee3a2df392483b069b523d0024ac271d5fd
Author: Ricardo Mones <ricardo at mones.org>
Date:   Tue Jun 3 23:52:07 2014 +0200

    Probable fix for Debian bug 730050 “vcalendar plugin crash”

diff --git a/src/plugins/vcalendar/vcal_dbus.c b/src/plugins/vcalendar/vcal_dbus.c
index dad54c1..8cb1854 100644
--- a/src/plugins/vcalendar/vcal_dbus.c
+++ b/src/plugins/vcalendar/vcal_dbus.c
@@ -103,11 +103,15 @@ static void handle_method_call (GDBusConnection       *connection,
 		/* Don't free that, it's done when subscriptions are
 		 * fetched */
 		icalcomponent *ical = (icalcomponent *)cur->data;
-		VCalEvent *event = vcal_get_event_from_ical(
-			icalcomponent_as_ical_string(ical), NULL);
-
-		add_event_to_builder_if_match(event, array, start, end);
-		g_free(event);
+		if (ical != NULL) {
+			VCalEvent *event = vcal_get_event_from_ical(
+				icalcomponent_as_ical_string(ical), NULL);
+			if (event != NULL) {
+				add_event_to_builder_if_match(
+					event, array, start, end);
+				g_free(event);
+			}
+		}
 	}
 	g_slist_free(list);
 

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/vcalendar/vcal_dbus.c |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list