summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--imap/ChangeLog5
-rw-r--r--maildrop/maildir.C4
-rw-r--r--sqwebmail/ChangeLog4
-rw-r--r--sqwebmail/gpg.c2
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" <hanno@hboeck.de>
+
+ * libs/maildrop/maildir.C (MaildirSave): Fix new/delete mismatch.
+ * libs/sqwebmail/gpg.c: Fix external linkage.
+
4.17.2
2016-08-03 Sam Varshavchik <mrsam@courier-mta.com>
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" <hanno@hboeck.de>
+
+ * gpg.c: Fix external linkage.
+
2016-03-04 Sam Varshavchik <mrsam@courier-mta.com>
* 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];