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

no more segfault when changing item priority (fixes Debian Bug #469297)

Browse Source
This commit is contained in:
Frederic Culot 2008-04-04 21:31:20 +00:00
parent 7a2a68de27
commit 54e2b815ec
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/todo.c
View File

@ -1,4 +1,4 @@
/* $calcurse: todo.c,v 1.19 2008/01/20 10:45:39 culot Exp $ */ /* $calcurse: todo.c,v 1.20 2008/04/04 21:31:20 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -202,7 +202,7 @@ todo_delete_note_bynum(unsigned num)
/* Delete an item from the todo linked list. */ /* Delete an item from the todo linked list. */
static void static void
todo_delete_bynum(unsigned num) todo_delete_bynum(unsigned num, erase_flag_e flag)
{ {
unsigned n; unsigned n;
struct todo_s *i, **iptr; struct todo_s *i, **iptr;
@ -214,7 +214,7 @@ todo_delete_bynum(unsigned num)
*iptr = i->next; *iptr = i->next;
free(i->mesg); free(i->mesg);
if (i->note != NULL) if (i->note != NULL)
erase_note(&i->note, ERASE_FORCE); erase_note(&i->note, flag);
free(i); free(i);
return; return;
} }
@ -271,7 +271,7 @@ todo_delete(conf_t *conf)
switch (answer) { switch (answer) {
case 't': case 't':
todo_delete_bynum(hilt - 1); todo_delete_bynum(hilt - 1, ERASE_FORCE);
todos--; todos--;
if (hilt > 1) if (hilt > 1)
hilt--; hilt--;
@ -328,17 +328,20 @@ todo_chg_priority(int action)
backup = todo_get_item(hilt); backup = todo_get_item(hilt);
strncpy(backup_mesg, backup->mesg, strlen(backup->mesg) + 1); strncpy(backup_mesg, backup->mesg, strlen(backup->mesg) + 1);
backup_id = backup->id; backup_id = backup->id;
strncpy(backup_note, backup->note, NOTESIZ + 1); if (backup->note)
strncpy(backup_note, backup->note, NOTESIZ + 1);
else
backup_note[0] = '\0';
if (action == '+') { if (action == '+') {
(backup_id > 1) ? backup_id-- : do_chg--; (backup_id > 1) ? backup_id-- : do_chg--;
} else if (action == '-') { } else if (action == '-') {
(backup_id < 9) ? backup_id++ : do_chg--; (backup_id < 9) ? backup_id++ : do_chg--;
} else { /* NOTREACHED */ } else { /* NOTREACHED */
fputs(_("FATAL ERROR in todo_chg_priority: no such action\n"), fputs(_("FATAL ERROR in todo_chg_priority: no such action\n"),
stderr); stderr);
} }
if (do_chg) { if (do_chg) {
todo_delete_bynum(hilt - 1); todo_delete_bynum(hilt - 1, ERASE_FORCE_KEEP_NOTE);
backup = todo_add(backup_mesg, backup_id, backup_note); backup = todo_add(backup_mesg, backup_id, backup_note);
hilt = todo_get_position(backup); hilt = todo_get_position(backup);
} }