From fad0ccf44dfe2a27c10d932c6d424bc3ebe38bd0 Mon Sep 17 00:00:00 2001 From: Sam Varshavchik Date: Tue, 20 Sep 2016 21:41:51 -0400 Subject: Fix new/delete mismatch, external linkage. --- imap/ChangeLog | 5 +++++ maildrop/maildir.C | 4 ++-- sqwebmail/ChangeLog | 4 ++++ sqwebmail/gpg.c | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/imap/ChangeLog b/imap/ChangeLog index 69e57c2..b97c815 100644 --- a/imap/ChangeLog +++ b/imap/ChangeLog @@ -1,3 +1,8 @@ +2016-09-20 "Hanno Böck" + + * libs/maildrop/maildir.C (MaildirSave): Fix new/delete mismatch. + * libs/sqwebmail/gpg.c: Fix external linkage. + 4.17.2 2016-08-03 Sam Varshavchik diff --git a/maildrop/maildir.C b/maildrop/maildir.C index 926b9d6..6907b7d 100644 --- a/maildrop/maildir.C +++ b/maildrop/maildir.C @@ -254,11 +254,11 @@ void Maildir::MaildirSave() if (libmail_kwmSetName(&kwh, kwm, n) < 0) { - delete n; + delete [] n; libmail_kwmDestroy(kwm); throw strerror(errno); } - delete n; + delete [] n; } char *tmpkname, *newkname; diff --git a/sqwebmail/ChangeLog b/sqwebmail/ChangeLog index 3dfda44..3450934 100644 --- a/sqwebmail/ChangeLog +++ b/sqwebmail/ChangeLog @@ -1,3 +1,7 @@ +2016-09-20 "Hanno Böck" + + * gpg.c: Fix external linkage. + 2016-03-04 Sam Varshavchik * Update to gettext-0.19.6 diff --git a/sqwebmail/gpg.c b/sqwebmail/gpg.c index fc28952..57f4ed4 100644 --- a/sqwebmail/gpg.c +++ b/sqwebmail/gpg.c @@ -36,7 +36,7 @@ extern void output_scriptptrget(); extern void print_attrencodedlen(const char *, size_t, int, FILE *); extern void print_safe(const char *); -const char *sqwebmail_content_charset; +extern const char *sqwebmail_content_charset; static char gpgerrbuf[1024]; -- cgit v1.2.3