fix CID 1596595: Resource leaks, and CID 1596594: (CHECKED_RETURN)

[claws.git] / src / plugins / vcalendar / vcal_manager.c

diff --git a/src/plugins/vcalendar/vcal_manager.c b/src/plugins/vcalendar/vcal_manager.c
index a6c84f7b636159f06220941dceb6bbfa31235ed4..b7f6c6d25baa52226d97ad937d51040b06b81f8d 100644 (file)
--- a/src/plugins/vcalendar/vcal_manager.c
+++ b/src/plugins/vcalendar/vcal_manager.c
@@ -1,7 +1,6 @@
 /*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2017 Colin Leroy <colin@colino.net> and 
- * the Claws Mail team
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2023 the Claws Mail team and Colin Leroy <colin@colino.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -354,7 +353,7 @@ gchar *vcal_manager_event_dump(VCalEvent *event, gboolean is_reply, gboolean is_
                            );  
 
        if (!calendar) {
-               g_warning ("can't generate calendar");
+               g_warning("can't generate calendar");
                g_free(organizer);
                g_free(tmpfile);
                g_free(attendee);
@@ -386,7 +385,7 @@ gchar *vcal_manager_event_dump(VCalEvent *event, gboolean is_reply, gboolean is_
                 ICAL_VEVENT_COMPONENT, (void*)0);
 
        if (!ievent) {
-               g_warning ("can't generate event");
+               g_warning("can't generate event");
                g_free(organizer);
                g_free(tmpfile);
                g_free(attendee);
@@ -537,10 +536,23 @@ static void get_rfc822_date_from_time_t(gchar *buf, gint len, time_t t)
                   day, dd, mon, yyyy, hh, mm, ss, tzoffset(&t));
 #else
        GDateTime *dt = g_date_time_new_from_unix_local(t);
-       gchar *buf2 = g_date_time_format(dt, "%a, %e %b %Y %H:%M:%S %z");
+       if (dt == NULL) {
+               g_warning("failed getting date/time");
+               g_snprintf(buf, len, "(NULL)");
+               return;
+       }
+
+       gchar *ret = g_date_time_format(dt, "%a, %e %b %Y %T %z");
        g_date_time_unref(dt);
-       strncpy(buf, buf2, len);
-       g_free(buf2);
+
+       if (ret == NULL) {
+               g_warning("failed formatting date/time");
+               g_snprintf(buf, len, "(NULL)");
+               return;
+       }
+
+       g_snprintf(buf, len, ret);
+       g_free(ret);
 #endif
 }
 
@@ -709,7 +721,7 @@ gchar *vcal_manager_icalevent_dump(icalcomponent *event, gchar *orga, icalcompon
                            );  
 
        if (!calendar) {
-               g_warning ("can't generate calendar");
+               g_warning("can't generate calendar");
                g_free(tmpfile);
                icalcomponent_free(ievent);
                return NULL;
@@ -926,7 +938,7 @@ void vcal_manager_save_event (VCalEvent *event, gboolean export_after)
        xml_tag_add_attr(tag, xml_attr_new("type", tmp));
        g_free(tmp);
        
-       tmp = g_strdup_printf("%ld", event->postponed);
+       tmp = g_strdup_printf("%"CM_TIME_FORMAT, event->postponed);
        xml_tag_add_attr(tag, xml_attr_new("postponed", tmp));
        g_free(tmp);
        
@@ -978,7 +990,7 @@ void vcal_manager_save_event (VCalEvent *event, gboolean export_after)
        xml_free_tree(rootnode);
 
        if (prefs_file_close(pfile) < 0) {
-               g_warning("failed to write event.");
+               g_warning("failed to write event");
                return;
        }
  
@@ -1330,12 +1342,10 @@ static gchar *write_headers_ical(PrefsAccount   *account,
        memset(date, 0, sizeof(date));
        
        prop = icalcomponent_get_first_property(ievent, ICAL_SUMMARY_PROPERTY);
-       if (prop) {
-               summary = g_strdup(icalproperty_get_summary(prop));
-               icalproperty_free(prop);
-       } else {
-               summary = g_strdup("");
-       }
+       summary = g_strdup(icalproperty_get_summary(prop));
+       icalproperty_free(prop);
+       if (!summary)
+               summary = g_strdup(_("[no summary]"));
        
        while (strchr(summary, '\n'))
                *(strchr(summary, '\n')) = ' ';