diff options
| author |   Marius Mauch <genone@gentoo.org> | 2006-04-24 21:27:54 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2006-04-24 21:27:54 +0000 |
| commit | 547be083506669560fdb3f72110e136363275cc2 (patch) | |
| tree | 974356cfd02cef6cd7ff5eb3eb425b02e4686d2e /mail-client/sylpheed-claws-vcalendar/files/vcalendar-1.71-invalid-free.patch | |
| parent | Stable on sparc wrt #130527 (diff) | |
| download | gentoo-2-547be083506669560fdb3f72110e136363275cc2.tar.gz gentoo-2-547be083506669560fdb3f72110e136363275cc2.tar.bz2 gentoo-2-547be083506669560fdb3f72110e136363275cc2.zip | |
version bump (bug #129798)
(Portage version: 2.1_pre9-r4)
Diffstat (limited to 'mail-client/sylpheed-claws-vcalendar/files/vcalendar-1.71-invalid-free.patch')
| -rw-r--r-- | mail-client/sylpheed-claws-vcalendar/files/vcalendar-1.71-invalid-free.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/mail-client/sylpheed-claws-vcalendar/files/vcalendar-1.71-invalid-free.patch b/mail-client/sylpheed-claws-vcalendar/files/vcalendar-1.71-invalid-free.patch new file mode 100644 index 000000000000..3214faa7bba9 --- /dev/null +++ b/mail-client/sylpheed-claws-vcalendar/files/vcalendar-1.71-invalid-free.patch @@ -0,0 +1,53 @@ +Index: src/vcalendar.c +=================================================================== +RCS file: /cvsroot/sylpheed-claws/plugins/vcalendar/src/vcalendar.c,v +retrieving revision 1.2.2.31 +diff -u -u -r1.2.2.31 vcalendar.c +--- src/vcalendar.c 16 Mar 2006 18:25:15 -0000 1.2.2.31 ++++ src/vcalendar.c 20 Apr 2006 06:32:40 -0000 +@@ -523,7 +523,8 @@ + } + g_free(label); + +- if (event->orgname && strlen(event->orgname)) { ++ if (event->orgname && strlen(event->orgname) ++ && event->organizer && strlen(event->organizer)) { + gchar *addr = g_strconcat(event->orgname, " <", event->organizer, ">", NULL); + GTK_LABEL_SET_TEXT_TRIMMED(GTK_LABEL(vcalviewer->who), addr); + g_free(addr); +@@ -822,10 +823,12 @@ + if (iprop) { + gchar *org, *orgname; + tmp = get_email_from_organizer_property(iprop); +- if (!g_utf8_validate(tmp, -1, NULL)) ++ if (tmp && !g_utf8_validate(tmp, -1, NULL)) + org = conv_codeset_strdup(tmp, charset, CS_UTF_8); +- else ++ else if (tmp) + org = g_strdup(tmp); ++ else ++ org = NULL; + g_free(tmp); + tmp = get_name_from_organizer_property(iprop); + printf(" %s !\n", tmp); +@@ -833,13 +836,17 @@ + orgname = conv_codeset_strdup(tmp, charset, CS_UTF_8); + else if (tmp) + orgname = g_strdup(tmp); ++ else ++ orgname = NULL; + g_free(tmp); +- if (orgname) { ++ if (orgname && org) { + gchar *addr = g_strconcat(orgname, " <", org, ">", NULL); + GTK_LABEL_SET_TEXT_TRIMMED(GTK_LABEL(vcalviewer->who), addr); + g_free(addr); +- } else { ++ } else if (org) { + GTK_LABEL_SET_TEXT_TRIMMED(GTK_LABEL(vcalviewer->who), org); ++ } else { ++ GTK_LABEL_SET_TEXT_TRIMMED(GTK_LABEL(vcalviewer->who), "-"); + } + icalproperty_free(iprop); + g_free(org); + |