fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check that note files open before reading them

Browse Source 
This fixes the scenario where a note file referenced by a todo, event,
or appointment is modified from outside the program in such a way that
it cannot be opened by the program, resulting in a segmentation fault.

The least surprising way to proceed is to ignore the note.

Signed-off-by: Nicholas Johnson <nick@nicksphere.ch>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Nicholas Johnson 2022-08-11 00:00:00 +00:00 committed by Lukas Fleischer
parent ac5113640d
commit 4cd300f2c4
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/day.c
View File

@ -634,6 +634,10 @@ void day_popup_item(struct day_item *day)
asprintf(&notepath, "%s%s", path_notes, day_item_get_note(day));
fp = fopen(notepath, "r");
if (fp == NULL) {
item_in_popup(NULL, NULL, day_item_get_mesg(day), _("Event:"));
return;
}
note_read_contents(note, note_size, fp);
fclose(fp);
mem_free(notepath);
@ -661,6 +665,10 @@ void day_popup_item(struct day_item *day)
asprintf(&notepath, "%s%s", path_notes, day_item_get_note(day));
fp = fopen(notepath, "r");
if (fp == NULL) {
item_in_popup(a_st, a_end, day_item_get_mesg(day), _("Appointment:"));
return;
}
note_read_contents(note, note_size, fp);
fclose(fp);
mem_free(notepath);

5
src/ui-todo.c
View File

@ -327,6 +327,11 @@ void ui_todo_popup_item(void)
asprintf(&notepath, "%s%s", path_notes, item->note);
fp = fopen(notepath, "r");
if (fp == NULL) {
item_in_popup(NULL, NULL, item->mesg, _("TODO:"));
return;
}
note_read_contents(note, note_size, fp);
fclose(fp);
mem_free(notepath);