summaryrefslogtreecommitdiff
path: root/databases/evolution-data-server/files
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2007-04-26 20:16:52 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2007-04-26 20:16:52 +0000
commit36716ad406c375e354accb99f42e7da6e4ef54bb (patch)
tree8eb37600a2dd2c573a408200a189d645426fa6f0 /databases/evolution-data-server/files
parentupdate to 4.1.3 (diff)
Fix a crash that can occur when calendar timezone files lack a TZNAME
field. Reported by: Yuri Pankov <yuri.pankov@gmail.com> Obtained from: http://bugzilla.gnome.org/show_bug.cgi?id=425129#c21
Notes
Notes: svn path=/head/; revision=190959
Diffstat (limited to 'databases/evolution-data-server/files')
-rw-r--r--databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltimezone.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltimezone.c b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltimezone.c
new file mode 100644
index 000000000000..cf14e5df65c7
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltimezone.c
@@ -0,0 +1,13 @@
+Index: calendar/libical/src/libical/icaltimezone.c
+===================================================================
+--- calendar/libical/src/libical/icaltimezone.c (révision 593)
++++ calendar/libical/src/libical/icaltimezone.c (copie de travail)
+@@ -1433,7 +1433,7 @@
+
+ z_offset = get_offset(zone);
+
+- if (z_offset == offset && !strcmp(tzname, zone->tznames))
++ if (z_offset == offset && zone->tznames && !strcmp(tzname, zone->tznames))
+ return zone;
+ }
+