Fix out-of-bounds memory access

Do not try to access freed day items. This also fixes unexpected
selection changes after modifying appointments or events.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer
2016-09-27 18:52:13 +02:00
parent 77d5b10ee0
commit ab9256adf0
4 changed files with 26 additions and 5 deletions

View File

@@ -49,6 +49,15 @@ int count, reg;
static void do_storage(int day_changed)
{
struct day_item *day = ui_day_selitem();
union aptev_ptr item;
if (day) {
/*
* day_process_storage() rebuilds the vector of day items, so
* we need to save the reference to the actual item here.
*/
item = day->item;
}
day_process_storage(ui_calendar_get_slctd_day(), day_changed);
ui_day_load_items();
@@ -56,7 +65,7 @@ static void do_storage(int day_changed)
if (day_changed)
ui_day_sel_reset();
else if (day)
ui_day_set_selitem(day);
ui_day_set_selitem_by_aptev_ptr(item);
}
static inline void key_generic_change_view(void)