( cvs diff -u -r 1.382.2.64 -r 1.382.2.65 src/compose.c; cvs diff -u -r 1.59.2.9 -r 1.59.2.10 src/prefs_filtering.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/prefs_filtering_action.c; cvs diff -u -r 1.30.2.6 -r 1.30.2.7 src/prefs_toolbar.c; ) > 0.9.12cvs146.12.patchset
( cvs diff -u -r 1.382.2.65 -r 1.382.2.66 src/compose.c; ) > 0.9.12cvs146.13.patchset
( cvs diff -u -r 1.382.2.66 -r 1.382.2.67 src/compose.c; ) > 0.9.12cvs146.14.patchset
+( cvs diff -u -r 1.150.2.12 -r 1.150.2.13 src/procmsg.c; ) > 0.9.12cvs147.1.patchset
if (!fwdmessageid) fwdmessageid = g_strdup(p);
break;
case Q_PRIVACY_SYSTEM:
- if (privacy_system == NULL) privacy_system = g_strdup(p);
+ if (!privacy_system) privacy_system = g_strdup(p);
break;
case Q_ENCRYPT:
if (p[0] == '1') encrypt = TRUE;
break;
case Q_ENCRYPT_DATA:
- if (encrypt_data == NULL) encrypt_data = g_strdup(p);
+ if (!encrypt_data) encrypt_data = g_strdup(p);
break;
}
}
filepos = ftell(fp);
if (encrypt) {
- /* FIXME: memory leaks, in case of errors */
MimeInfo *mimeinfo;
fclose(fp);
-
+
mimeinfo = procmime_scan_queue_file(file);
- if (!privacy_encrypt(privacy_system, mimeinfo, encrypt_data))
- return -1;
-
- fp = my_tmpfile();
- if (procmime_write_mimeinfo(mimeinfo, fp) < 0) {
- fclose(fp);
+ if (!privacy_encrypt(privacy_system, mimeinfo, encrypt_data)
+ || (fp = my_tmpfile()) == NULL
+ || procmime_write_mimeinfo(mimeinfo, fp) < 0) {
+ if (fp)
+ fclose(fp);
+ procmime_mimeinfo_free_all(mimeinfo);
+ g_free(from);
+ g_free(smtpserver);
+ slist_free_strings(to_list);
+ g_slist_free(to_list);
+ slist_free_strings(newsgroup_list);
+ g_slist_free(newsgroup_list);
+ g_free(savecopyfolder);
+ g_free(replymessageid);
+ g_free(fwdmessageid);
+ g_free(privacy_system);
+ g_free(encrypt_data);
return -1;
}
- procmime_mimeinfo_free_all(mimeinfo);
rewind(fp);
filepos = 0;
g_free(tmp);
}
- slist_free_strings(to_list);
- g_slist_free(to_list);
- slist_free_strings(newsgroup_list);
- g_slist_free(newsgroup_list);
- g_free(from);
- g_free(smtpserver);
fclose(fp);
/* save message to outbox */
g_strfreev(tokens);
}
+ g_free(from);
+ g_free(smtpserver);
+ slist_free_strings(to_list);
+ g_slist_free(to_list);
+ slist_free_strings(newsgroup_list);
+ g_slist_free(newsgroup_list);
g_free(savecopyfolder);
g_free(replymessageid);
g_free(fwdmessageid);
-
+ g_free(privacy_system);
+ g_free(encrypt_data);
+
return (newsval != 0 ? newsval : mailval);
}