diff options
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-table.c | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index e80cb59db7..dc6d6d2a04 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,4 +1,11 @@ 2004-07-21 JP Rosevear <jpr@novell.com> + + Fixes #61776 + + * gui/e-calendar-table.c (clipboard_get_text_cb): make sure the + text is not NULL + +2004-07-21 JP Rosevear <jpr@novell.com> Fixes #61738 diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index a0688fa8b5..08e5f30393 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -838,7 +838,6 @@ e_calendar_table_copy_clipboard (ECalendarTable *cal_table) static void clipboard_get_text_cb (GtkClipboard *clipboard, const gchar *text, ECalendarTable *cal_table) { - char *comp_str; icalcomponent *icalcomp; char *uid; ECalComponent *comp; @@ -847,8 +846,10 @@ clipboard_get_text_cb (GtkClipboard *clipboard, const gchar *text, ECalendarTabl g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table)); - comp_str = (char *) text; - icalcomp = icalparser_parse_string ((const char *) comp_str); + if (!text || !*text) + return; + + icalcomp = icalparser_parse_string (text); if (!icalcomp) return; |