talons

commit 77f99ee3a2df392483b069b523d0024ac271d5fd
parent f9985ae65ffaad270013e2ecb618e4556a4411e3
Author: Ricardo Mones <ricardo@mones.org>
Date:   Tue,  3 Jun 2014 23:52:07 +0200

Probable fix for Debian bug 730050 “vcalendar plugin crash”

Diffstat:
M
src/plugins/vcalendar/vcal_dbus.c
 | 
14
+++++++++-----

1 file changed, 9 insertions(+), 5 deletions(-)
diff --git 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);