* if the message is not valid, try to free the message pointer in message_free

[citadel.git] / citadel / serv_calendar.c

diff --git a/citadel/serv_calendar.c b/citadel/serv_calendar.c
index 56d8294b17feecf67f05b2121d5d014559956912..7833ab84fd00866680c425681379bca7b091934e 100644 (file)
--- a/citadel/serv_calendar.c
+++ b/citadel/serv_calendar.c
@@ -310,7 +310,7 @@ void ical_send_a_reply(icalcomponent *request, char *action) {
        reply_message_text = malloc(strlen(serialized_reply) + SIZ);
        if (reply_message_text != NULL) {
                sprintf(reply_message_text,
-                       "Content-type: text/calendar\r\n\r\n%s\r\n",
+                       "Content-type: text/calendar charset=\"utf-8\"\r\n\r\n%s\r\n",
                        serialized_reply
                );
 
@@ -376,7 +376,7 @@ void ical_locate_part(char *name, char *filename, char *partnum, char *disp,
  * Respond to a meeting request.
  */
 void ical_respond(long msgnum, char *partnum, char *action) {
-       struct CtdlMessage *msg;
+       struct CtdlMessage *msg = NULL;
        struct ical_respond_data ird;
 
        if (
@@ -430,7 +430,7 @@ void ical_respond(long msgnum, char *partnum, char *action) {
                /* Now that we've processed this message, we don't need it
                 * anymore.  So delete it.
                 */
-               CtdlDeleteMessages(CC->room.QRname, msgnum, "", 1);
+               CtdlDeleteMessages(CC->room.QRname, &msgnum, 1, "");
 
                /* Free the memory we allocated and return a response. */
                icalcomponent_free(ird.cal);
@@ -606,7 +606,7 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) {
        char uid[SIZ];
        char hold_rm[ROOMNAMELEN];
        long msgnum_being_replaced = 0;
-       struct CtdlMessage *msg;
+       struct CtdlMessage *msg = NULL;
        struct original_event_container oec;
        icalcomponent *original_event;
        char *serialized_event = NULL;
@@ -680,7 +680,7 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) {
        message_text = malloc(strlen(serialized_event) + SIZ);
        if (message_text != NULL) {
                sprintf(message_text,
-                       "Content-type: text/calendar\r\n\r\n%s\r\n",
+                       "Content-type: text/calendar charset=\"utf-8\"\r\n\r\n%s\r\n",
                        serialized_event
                );
 
@@ -712,7 +712,7 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) {
  * passes it up to ical_update_my_calendar_with_reply() for processing.
  */
 void ical_handle_rsvp(long msgnum, char *partnum, char *action) {
-       struct CtdlMessage *msg;
+       struct CtdlMessage *msg = NULL;
        struct ical_respond_data ird;
        int ret;
 
@@ -777,7 +777,7 @@ void ical_handle_rsvp(long msgnum, char *partnum, char *action) {
                /* Now that we've processed this message, we don't need it
                 * anymore.  So delete it.  (Maybe make this optional?)
                 */
-               CtdlDeleteMessages(CC->room.QRname, msgnum, "", 1);
+               CtdlDeleteMessages(CC->room.QRname, &msgnum, 1, "");
 
                /* Free the memory we allocated and return a response. */
                icalcomponent_free(ird.cal);
@@ -876,7 +876,7 @@ int ical_ctdl_is_overlap(
  */
 void ical_hunt_for_conflicts_backend(long msgnum, void *data) {
        icalcomponent *cal;
-       struct CtdlMessage *msg;
+       struct CtdlMessage *msg = NULL;
        struct ical_respond_data ird;
        struct icaltimetype t1start, t1end, t2start, t2end;
        icalproperty *p;
@@ -976,7 +976,7 @@ void ical_hunt_for_conflicts(icalcomponent *cal) {
 
        cprintf("%d Conflicting events:\n", LISTING_FOLLOWS);
 
-       CtdlForEachMessage(MSGS_ALL, 0, "text/calendar",
+       CtdlForEachMessage(MSGS_ALL, 0, NULL, "text/calendar",
                NULL,
                ical_hunt_for_conflicts_backend,
                (void *) cal
@@ -993,7 +993,7 @@ void ical_hunt_for_conflicts(icalcomponent *cal) {
  * Hunt for conflicts (Phase 1 -- retrieve the object and call Phase 2)
  */
 void ical_conflicts(long msgnum, char *partnum) {
-       struct CtdlMessage *msg;
+       struct CtdlMessage *msg = NULL;
        struct ical_respond_data ird;
 
        msg = CtdlFetchMessage(msgnum, 1);
@@ -1133,7 +1133,7 @@ void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *cal) {
  */
 void ical_freebusy_backend(long msgnum, void *data) {
        icalcomponent *cal;
-       struct CtdlMessage *msg;
+       struct CtdlMessage *msg = NULL;
        struct ical_respond_data ird;
 
        cal = (icalcomponent *)data;
@@ -1281,7 +1281,7 @@ void ical_freebusy(char *who) {
 
        /* Add busy time from events */
        lprintf(CTDL_DEBUG, "Adding busy time from events\n");
-       CtdlForEachMessage(MSGS_ALL, 0, "text/calendar",
+       CtdlForEachMessage(MSGS_ALL, 0, NULL, "text/calendar",
                NULL, ical_freebusy_backend, (void *)fb
        );
 
@@ -1336,7 +1336,7 @@ void ical_freebusy(char *who) {
  */
 void ical_getics_backend(long msgnum, void *data) {
        icalcomponent *encaps, *c;
-       struct CtdlMessage *msg;
+       struct CtdlMessage *msg = NULL;
        struct ical_respond_data ird;
 
        encaps = (icalcomponent *)data;
@@ -1421,7 +1421,8 @@ void ical_getics(void)
        icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH);
 
        /* Now go through the room encapsulating all calendar items. */
-       CtdlForEachMessage(MSGS_ALL, 0, "text/calendar",
+       CtdlForEachMessage(MSGS_ALL, 0, NULL,
+               "text/calendar",
                NULL,
                ical_getics_backend,
                (void *) encaps
@@ -1473,7 +1474,7 @@ void ical_putics(void)
         * the entire calendar with an entire new (or updated) calendar.
         * (Careful: this opens an S_ROOMS critical section!)
         */
-       CtdlDeleteMessages(CC->room.QRname, 0L, "", 0);
+       CtdlDeleteMessages(CC->room.QRname, NULL, 0, "");
 
        /* If the top-level component is *not* a VCALENDAR, we can drop it right
         * in.  This will almost never happen.