From 5a89dabc7cfff27beb866f4e10768f21629bbba4 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Thu, 13 May 2004 09:37:40 +0000 Subject: add some array bounds checking as an attempt to isolate the crash in 2004-05-13 Not Zed * gui/e-week-view-event-item.c (e_week_view_event_item_draw): add some array bounds checking as an attempt to isolate the crash in #57644. svn path=/trunk/; revision=25896 --- calendar/ChangeLog | 6 ++++++ calendar/gui/e-week-view-event-item.c | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 96b56aac6c..5b47fe211d 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2004-05-13 Not Zed + + * gui/e-week-view-event-item.c (e_week_view_event_item_draw): add + some array bounds checking as an attempt to isolate the crash in + #57644. + 2004-05-11 Not Zed * gui/migration.c (migrate_calendars, migrate_tasks): add GError diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index 0bc43e12ef..22f33ebe43 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -250,8 +250,13 @@ e_week_view_event_item_draw (GnomeCanvasItem *canvas_item, if (wveitem->event_num == -1 || wveitem->span_num == -1) return; + g_return_if_fail(wveitem->event_num < week_view->events->len); + event = &g_array_index (week_view->events, EWeekViewEvent, wveitem->event_num); + + g_return_if_fail(event->spans_index + wveitem->span_num < week_view->spans->len); + span = &g_array_index (week_view->spans, EWeekViewEventSpan, event->spans_index + wveitem->span_num); -- cgit v1.2.3