Fixed a bug related to memory management (a free on a null pointer causes an abort now, which induces side effects on file import).

2 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 8d358a7..14eb99a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-15  Frederic Culot  <frederic@culot.org>
+
+	* src/io.c: could not import ical files anymore if notes were not
+	attached to items (thanks Chris for reporting it)
+	
 2009-07-12  Frederic Culot  <frederic@culot.org>
 
 	* configure.ac
diff --git a/src/io.c b/src/io.c
index 05b24db..582d91e 100755
--- a/src/io.c
+++ b/src/io.c
@@ -1,4 +1,4 @@
-/*	$calcurse: io.c,v 1.68 2009/07/12 17:48:13 culot Exp $	*/
+/*	$calcurse: io.c,v 1.69 2009/07/15 18:48:44 culot Exp $	*/
 
 /*
  * Calcurse - text-based organizer
@@ -1666,7 +1666,8 @@ ical_store_todo (int priority, char *mesg, char *note)
 {
   todo_add (mesg, priority, note);
   mem_free (mesg);
-  mem_free (note);
+  if (note)
+    mem_free (note);
 }
 
 static void
@@ -1720,7 +1721,8 @@ ical_store_apoint (char *mesg, char *note, long start, long dur,
       apoint_new (mesg, note, start, dur, state);
     }
   mem_free (mesg);
-  mem_free (note);
+  if (note)
+    mem_free (note);
 }
 
 /*