From 5f6a18500c3119731663ac4c059426c62a3b37f6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 13 Aug 2008 12:00:21 +0000 Subject: Merge revisions 35931:35950 from trunk. svn path=/branches/kill-bonobo/; revision=35978 --- calendar/ChangeLog | 7 +++++++ calendar/gui/itip-utils.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 75c9143ca0..feda5578cf 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2008-08-08 Milan Crha + + ** Fix for bug #544117 + + * gui/itip-utils.c: (itip_send_comp): Initialize variables to NULL, + to not free uninitialized memory in the cleanup part on the error. + 2008-08-06 Milan Crha ** Fix for bug #249844 diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index c60b7d3dc1..616e1edbe7 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -1142,9 +1142,9 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp, ECalComponent *comp = NULL; icalcomponent *top_level = NULL; char *ical_string = NULL; - gchar *from; - gchar *content_type; - gchar *subject; + gchar *from = NULL; + gchar *content_type = NULL; + gchar *subject = NULL; gboolean retval = FALSE; /* check whether backend could handle sending requests/updates */ -- cgit v1.2.3