diff options
| author | Suman Manjunath <msuman@src.gnome.org> | 2008-05-23 10:29:26 +0000 |
|---|---|---|
| committer | Suman Manjunath <msuman@src.gnome.org> | 2008-05-23 10:29:26 +0000 |
| commit | 82b26992d35410f44be94a7235b5b6fb6db45f14 (patch) | |
| tree | 13b1903f4f0408d7e438e9fe0a3bfcc461ee3c69 | |
| parent | f23767a8b1ce200119211572a26f40676ee774f4 (diff) | |
| download | evolution-data-server-82b26992d35410f44be94a7235b5b6fb6db45f14.tar.gz | |
Patch from Paul Smith <psmith@gnu.org>: Fix for bug #534077 (Use of memory after free in e-cal-backend-sync.c)
svn path=/trunk/; revision=8835
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/libedata-cal/e-cal-backend-sync.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 1ee290946..fa379c02f 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2008-05-23 Paul Smith <psmith@gnu.org> + + ** Fix for bug #534077 + + * libedata-cal/e-cal-backend-sync.c: + (e_cal_backend_sync_set_default_zone): Don't use freed memory. + 2008-05-23 Ed Catmur <ed@catmur.co.uk> ** Fix for bug #533780 diff --git a/calendar/libedata-cal/e-cal-backend-sync.c b/calendar/libedata-cal/e-cal-backend-sync.c index bfa63ee37..c9815e016 100644 --- a/calendar/libedata-cal/e-cal-backend-sync.c +++ b/calendar/libedata-cal/e-cal-backend-sync.c @@ -544,10 +544,10 @@ e_cal_backend_sync_set_default_zone (ECalBackendSync *backend, EDataCal *cal, co tzid = icaltimezone_get_tzid (zone); } - icaltimezone_free (zone, 1); - LOCK_WRAPPER (set_default_timezone_sync, (backend, cal, tzid)); + icaltimezone_free (zone, 1); + return status; } |