r1195 - in /unstable/evolution-exchange/debian: changelog patches/20_fix_crash_in_ical.patch

[heikkih-guest at users.alioth.debian.org]

Author: heikkih-guest
Date: Wed Apr 29 11:04:39 2009
New Revision: 1195

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1195
Log:
fix for ical-crash

Added:
    unstable/evolution-exchange/debian/patches/20_fix_crash_in_ical.patch
Modified:
    unstable/evolution-exchange/debian/changelog

Modified: unstable/evolution-exchange/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-exchange/debian/changelog?rev=1195&op=diff
==============================================================================
--- unstable/evolution-exchange/debian/changelog (original)
+++ unstable/evolution-exchange/debian/changelog Wed Apr 29 11:04:39 2009
@@ -1,3 +1,10 @@
+evolution-exchange (2.26.1-2) unstable; urgency=low
+
+  * Add patches/20_fix_crash_in_ical.patch
+    Fixes crash on startup (closes: #526015)
+
+ -- Heikki Henriksen <heikkih at case.heitech.local>  Wed, 29 Apr 2009 12:27:50 +0200
+
 evolution-exchange (2.26.1-1) unstable; urgency=low
 
   * New upstream release.

Added: unstable/evolution-exchange/debian/patches/20_fix_crash_in_ical.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-exchange/debian/patches/20_fix_crash_in_ical.patch?rev=1195&op=file
==============================================================================
--- unstable/evolution-exchange/debian/patches/20_fix_crash_in_ical.patch (added)
+++ unstable/evolution-exchange/debian/patches/20_fix_crash_in_ical.patch Wed Apr 29 11:04:39 2009
@@ -1,0 +1,60 @@
+--- calendar/e-cal-backend-exchange.c	(revision 1910)
++++ calendar/e-cal-backend-exchange.c	(working copy)
+@@ -276,12 +276,16 @@ save_object (gpointer key, gpointer valu
+ 	icalcomponent *icalcomp;
+ 	GList *l;
+ 
+-	icalcomp = icalcomponent_new_clone (ecomp->icomp);
+-	icalcomponent_add_component (vcalcomp, icalcomp);
++	if (ecomp->icomp) {
++		icalcomp = icalcomponent_new_clone (ecomp->icomp);
++		icalcomponent_add_component (vcalcomp, icalcomp);
++	}
+ 
+ 	for (l = ecomp->instances; l; l = l->next) {
+-		icalcomp = icalcomponent_new_clone (l->data);
+-		icalcomponent_add_component (vcalcomp, icalcomp);
++		if (l->data) {
++			icalcomp = icalcomponent_new_clone (l->data);
++			icalcomponent_add_component (vcalcomp, icalcomp);
++		}
+ 	}
+ }
+ 
+@@ -838,7 +842,8 @@ e_cal_backend_exchange_modify_object (EC
+ 		return FALSE;
+ 
+ 	if (mod == CALOBJ_MOD_ALL || icaltime_is_null_time (rid) || discard_detached) {
+-		icalcomponent_free (ecomp->icomp);
++		if (ecomp->icomp)
++			icalcomponent_free (ecomp->icomp);
+ 		ecomp->icomp = icalcomponent_new_clone (comp);
+ 		if (discard_detached && !icaltime_is_null_time (rid))
+ 			discard_detached_instance (ecomp, rid);
+@@ -1020,7 +1025,7 @@ get_object (ECalBackendSync *backend, ED
+ 
+ 			*object = icalcomponent_as_ical_string_r (vcalcomp);
+ 			icalcomponent_free (vcalcomp);
+-		} else {
++		} else if (ecomp->icomp) {
+ 			/* There are no detached instances. Send only the master object */
+ 			*object = icalcomponent_as_ical_string_r (ecomp->icomp);
+ 		}
+@@ -1633,7 +1638,6 @@ check_change_type (gpointer key, gpointe
+ 	*/
+ 	if (!ecomp)
+ 		return;
+-	icomp = ecomp->icomp;
+ 	l = ecomp->instances;
+ 	for (icomp = ecomp->icomp; l; icomp = l->data, l = l->next) {
+ 		if (!icomp)
+@@ -2127,7 +2131,8 @@ free_exchange_comp (gpointer value)
+ 	g_free (ecomp->href);
+ 	g_free (ecomp->lastmod);
+ 
+-	icalcomponent_free (ecomp->icomp);
++	if (ecomp->icomp)
++		icalcomponent_free (ecomp->icomp);
+ 
+ 	for (inst = ecomp->instances; inst; inst = inst->next)
+ 		icalcomponent_free (inst->data);