aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/calendar-model.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index c964be13ee..a78c5ffadf 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-30 Damon Chaplin <damon@ximian.com>
+
+ * gui/calendar-model.c (dup_date_edit_value): return NULL if passed
+ NULL. Should fix bug #14048.
+
2001-10-30 Federico Mena Quintero <federico@ximian.com>
* gui/calendar-config.c (config_read): Do not ignore the
diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
index 3d62857b82..629a4f6108 100644
--- a/calendar/gui/calendar-model.c
+++ b/calendar/gui/calendar-model.c
@@ -1411,6 +1411,9 @@ dup_date_edit_value (const void *value)
{
ECellDateEditValue *dv, *orig_dv;
+ if (value == NULL);
+ return NULL;
+
orig_dv = (ECellDateEditValue*) value;
dv = g_new (ECellDateEditValue, 1);