aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/dialogs/comp-editor.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index ca76346366..0b66e07e65 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-21 Jedy Wang <jedy.wang@sun.com>
+
+ ** Fixes bug #476124.
+
+ * calendar/gui/dialogs/comp-editor.c: Handle NULL pointer.
+
2007-09-14 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #476231
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index dec56852c7..d54c06347f 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2362,6 +2362,8 @@ set_attachment_list (CompEditor *editor, GSList *attach_list)
/* get url sans protocol and add it to the bar.
* how to set the filename properly */
file_name = g_filename_from_uri (attach_filename, NULL, NULL);
+ if (!file_name)
+ continue;
if (g_stat (file_name, &statbuf) < 0) {
g_warning ("Cannot attach file %s: %s", file_name, g_strerror (errno));