[evolution-data-server/gnome-3-30] Crash on meeting cancellation receive in local calendar

[Milan Crha <mcrha src gnome org>]

commit fbd02f98101062e0bc961dd2205a4a1f4c2271e4
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jan 2 19:39:51 2019 +0100

    Crash on meeting cancellation receive in local calendar
    
    Reported downstream as:
    https://bugzilla.redhat.com/show_bug.cgi?id=1660257

 src/calendar/backends/file/e-cal-backend-file.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c
index 4ac2dd1fe..438dd7a48 100644
--- a/src/calendar/backends/file/e-cal-backend-file.c
+++ b/src/calendar/backends/file/e-cal-backend-file.c
@@ -3369,8 +3369,9 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend,
        }
 
        /* Merge the iCalendar components with our existing VCALENDAR,
-        * resolving any conflicting TZIDs. */
+        * resolving any conflicting TZIDs. It also frees the toplevel_comp. */
        icalcomponent_merge_component (priv->icalcomp, toplevel_comp);
+       toplevel_comp = NULL;
 
        /* Now we manipulate the components we care about */
        comps = g_list_sort (comps, masters_first_cmp);
@@ -3488,8 +3489,7 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend,
                                                                        id, old_component, new_component);
 
                                /* remove the component from the toplevel VCALENDAR */
-                               icalcomponent_remove_component (toplevel_comp, subcomp);
-                               icalcomponent_free (subcomp);
+                               icalcomponent_remove_component (priv->icalcomp, subcomp);
                                e_cal_component_free_id (id);
 
                                if (new_component)