summaryrefslogtreecommitdiff
blob: a357e45c31c4361c1af299d17c14c39e3492a11c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
--- kdepim/libkcal/libical/src/libical/icalarray.c	2005/07/26 18:54:59	438982
+++ kdepim/libkcal/libical/src/libical/icalarray.c	2006/05/06 09:14:35	537923
@@ -149,10 +149,10 @@
 			new_space_allocated * array->element_size);
 	*/
 	new_data = malloc(new_space_allocated * array->element_size);
-	memcpy(new_data,array->data,array->element_size*array->space_allocated);
-	free(array->data);
 
     if (new_data) {
+    	memcpy(new_data,array->data,array->element_size*array->space_allocated);
+	free(array->data);
 	array->data = new_data;
 	array->space_allocated = new_space_allocated;
     } else {
--- kdepim/libkcal/libical/src/libical/icalcomponent.c	2005/09/18 12:37:01	461680
+++ kdepim/libkcal/libical/src/libical/icalcomponent.c	2006/05/06 09:14:35	537923
@@ -848,8 +848,8 @@
 
   /** Now test against the EXRULEs **/
   for (exrule = icalcomponent_get_first_property(comp,ICAL_EXRULE_PROPERTY);
-       exdate != NULL;
-       exdate = icalcomponent_get_next_property(comp,ICAL_EXRULE_PROPERTY)) {
+       exrule != NULL;
+       exrule = icalcomponent_get_next_property(comp,ICAL_EXRULE_PROPERTY)) {
 	 
     struct icalrecurrencetype recur = icalproperty_get_exrule(exrule);
     icalrecur_iterator *exrule_itr  = icalrecur_iterator_new(recur, *dtstart);
--- kdepim/libkcal/libical/src/libical/icaltypes.c	2005/07/26 18:54:59	438982
+++ kdepim/libkcal/libical/src/libical/icaltypes.c	2006/05/06 09:14:35	537923
@@ -77,7 +77,7 @@
 
     
     struct icaltriggertype tr, null_tr;
-    icalerrorstate es;
+    icalerrorstate es = ICAL_ERROR_UNKNOWN;
     icalerrorenum e;
 
     tr.time= icaltime_null_time();