[Commits] [SCM] claws branch, master, updated. 3.9.3-75-g6467a95

[colin at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  6467a954acdc0f0e256f39f361ffcec44fabff3b (commit)
       via  bd7c33e92da9c2e196113774ccd79a0a0d390a63 (commit)
       via  e8333936df5110f9d0a8d73cafc41fcab595f831 (commit)
      from  7445f4f8674ea0a02e4baff42342b0d9f7754114 (commit)


- Log -----------------------------------------------------------------
commit 6467a954acdc0f0e256f39f361ffcec44fabff3b
Author: Colin Leroy <colin at colino.net>
Date:   Mon Apr 21 11:41:35 2014 +0200

    Fix recognition of quoted parameter values, which are legal.

diff --git a/src/plugins/vcalendar/libical/libical/icalderivedparameter.c.in b/src/plugins/vcalendar/libical/libical/icalderivedparameter.c.in
index 895ecc4..ddc52cc 100644
--- a/src/plugins/vcalendar/libical/libical/icalderivedparameter.c.in
+++ b/src/plugins/vcalendar/libical/libical/icalderivedparameter.c.in
@@ -178,12 +178,19 @@ icalparameter* icalparameter_new_from_value_string(icalparameter_kind kind,const
 
     for (i=0; icalparameter_map[i].kind != ICAL_NO_PARAMETER; i++){
         if(kind == icalparameter_map[i].kind) {
+	    char *raw_val = strdup(val);
+	    char *value = raw_val;
             found_kind = 1;
-            if(strcmp(val,icalparameter_map[i].str) == 0) {
-
+	    if(value[0] == '\"' && value[strlen(value) - 1] == '\"') {
+		value++;
+		value[strlen(value) - 1] = '\0';
+	    }
+            if(strcmp(value,icalparameter_map[i].str) == 0) {
+		free(raw_val);
                 param->data = (int)icalparameter_map[i].enumeration;
                 return param;
             }
+	    free(raw_val);
         }
     }
     

commit bd7c33e92da9c2e196113774ccd79a0a0d390a63
Author: Colin Leroy <colin at colino.net>
Date:   Mon Apr 21 11:02:45 2014 +0200

    Fix bug #313, "Crash on reccurent events with no DTSTART"

diff --git a/src/plugins/vcalendar/vcal_folder.c b/src/plugins/vcalendar/vcal_folder.c
index 579349b..63245b0 100644
--- a/src/plugins/vcalendar/vcal_folder.c
+++ b/src/plugins/vcalendar/vcal_folder.c
@@ -548,7 +548,7 @@ static gint feed_fetch(FolderItem *fitem, MsgNumberList ** list, gboolean *old_u
 			prop = icalcomponent_get_first_property(evt, ICAL_DTSTART_PROPERTY);
 			if (prop) {
         			ritr = icalrecur_iterator_new(recur, icalproperty_get_dtstart(prop));
-				next = icalrecur_iterator_next(ritr); /* skip first one */				
+				next = icalrecur_iterator_next(ritr); /* skip first one */
 			}
 			
 			rprop = rprop2;
@@ -606,7 +606,7 @@ add_new:
 				item->evtlist = g_slist_prepend(item->evtlist, data);
 				data = NULL;
 			}
-			if (rprop) {
+			if (rprop && ritr) {
 				struct icaldurationtype ical_dur;
 				struct icaltimetype dtstart, dtend;
 				evt = icalcomponent_new_clone(evt);
@@ -622,7 +622,7 @@ add_new:
 				if (prop)
 					dtend = icalproperty_get_dtend(prop);
 				ical_dur = icaltime_subtract(dtend, dtstart);
-				next = icalrecur_iterator_next(ritr); 
+				next = icalrecur_iterator_next(ritr);
 				if (!icaltime_is_null_time(next) &&
 				    !icaltime_is_null_time(dtstart) && i < 100) {
 					prop = icalcomponent_get_first_property(evt, ICAL_DTSTART_PROPERTY);

commit e8333936df5110f9d0a8d73cafc41fcab595f831
Author: Colin Leroy <colin at colino.net>
Date:   Mon Apr 21 10:56:54 2014 +0200

    Fix bug #3116, "invalid DTSTART in ics subscription makes claws crash"

diff --git a/src/plugins/vcalendar/vcal_folder.c b/src/plugins/vcalendar/vcal_folder.c
index cacb552..579349b 100644
--- a/src/plugins/vcalendar/vcal_folder.c
+++ b/src/plugins/vcalendar/vcal_folder.c
@@ -2217,8 +2217,8 @@ VCalEvent *vcal_get_event_from_ical(const gchar *ical, const gchar *charset)
 			struct icaltimetype itt;
 			icalproperty_free(prop);
 			GET_PROP(comp, prop, ICAL_DTSTART_PROPERTY);
-			itt = icalproperty_get_dtstart(prop);
 			if (prop) {
+				itt = icalproperty_get_dtstart(prop);
 				icalproperty_free(prop);
 				dtend = g_strdup(icaltime_as_ical_string(icaltime_add(itt,duration)));
 				TO_UTF8(dtend);

-----------------------------------------------------------------------

Summary of changes:
 .../vcalendar/libical/libical/icalderivedparameter.c.in     |   11 +++++++++--
 src/plugins/vcalendar/vcal_folder.c                         |    8 ++++----
 2 files changed, 13 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Claws Mail