From 9debe3352135af9f53d1e7a979f5a46b5410dd60 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 3 Sep 2013 21:47:27 -0500 Subject: Protect against invalid begin or end dates --- src/planner.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/planner.c') diff --git a/src/planner.c b/src/planner.c index 1643651..6cbf80c 100644 --- a/src/planner.c +++ b/src/planner.c @@ -184,6 +184,8 @@ indicator_datetime_planner_get_appointments (IndicatorDatetimePlanner * self, GD GSList * appointments; g_return_val_if_fail (INDICATOR_IS_DATETIME_PLANNER (self), NULL); + g_return_val_if_fail (begin != NULL, NULL); + g_return_val_if_fail (end != NULL, NULL); appointments = INDICATOR_DATETIME_PLANNER_GET_CLASS (self)->get_appointments (self, begin, end); return g_slist_sort (appointments, compare_appointments_by_start_time); -- cgit v1.2.3 From fde292a8ff3c830ea27f3a11f45e959596fede09 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 8 Sep 2013 13:17:08 -0500 Subject: Bad merge --- src/planner.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/planner.c') diff --git a/src/planner.c b/src/planner.c index 17cc55b..e826c2c 100644 --- a/src/planner.c +++ b/src/planner.c @@ -188,6 +188,8 @@ indicator_datetime_planner_get_appointments (IndicatorDatetimePlanner * self, IndicatorDatetimePlannerClass * klass; g_return_if_fail (INDICATOR_IS_DATETIME_PLANNER (self)); + g_return_val_if_fail (begin != NULL, NULL); + g_return_val_if_fail (end != NULL, NULL); klass = INDICATOR_DATETIME_PLANNER_GET_CLASS (self); g_return_if_fail (klass->get_appointments != NULL); @@ -203,8 +205,6 @@ indicator_datetime_planner_get_appointments_finish (IndicatorDatetimePlanner * GSList * appointments; g_return_val_if_fail (INDICATOR_IS_DATETIME_PLANNER (self), NULL); - g_return_val_if_fail (begin != NULL, NULL); - g_return_val_if_fail (end != NULL, NULL); klass = INDICATOR_DATETIME_PLANNER_GET_CLASS (self); g_return_val_if_fail (klass->get_appointments_finish != NULL, NULL); -- cgit v1.2.3