From c4a5437d9c06ad2563b5cbbec074336843b1f780 Mon Sep 17 00:00:00 2001 From: Peter Pentchev Date: Thu, 17 Jun 2010 14:25:48 +0000 Subject: [PATCH] Merge trunk rev. 5015: fix a double-free bug. --- changelog | 1 + patches/29-double-free.patch | 18 ++++++++++++++++++ patches/series | 1 + 3 files changed, 20 insertions(+) create mode 100644 patches/29-double-free.patch diff --git a/changelog b/changelog index 8eab598..770ff7b 100644 --- a/changelog +++ b/changelog @@ -13,6 +13,7 @@ dma (0.0.2009.08.29-1) UNRELEASED; urgency=low - add the 27-int-size patch to cast a variable to the correct type - add the 28-valid-recipient patch to fix parsing recipients out of the message body + - add the 29-double-free patch to fix a double-free error - refresh 01-debian-build, 03-debian-locations, 04-debian-setgid, 09-typos, 10-liblockfile, 11-double-bounce, 17-mailname, 23-dirent-d_type, 24-random-message-id, and 25-unsupported-starttls diff --git a/patches/29-double-free.patch b/patches/29-double-free.patch new file mode 100644 index 0000000..847cc36 --- /dev/null +++ b/patches/29-double-free.patch @@ -0,0 +1,18 @@ +Description: Fix a double-free bug. + I'll forward this patch as soon as I catch up with the dma upstream. +Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/ +Forwarded: no +Author: Peter Pentchev +Last-Update: 2010-06-17 + +--- a/spool.c ++++ b/spool.c +@@ -315,7 +315,7 @@ + if (queuefn != NULL) + free(queuefn); + if (mailfn != NULL) +- free(queuefn); ++ free(mailfn); + } + closedir(spooldir); + return (0); diff --git a/patches/series b/patches/series index e60f17d..d331864 100644 --- a/patches/series +++ b/patches/series @@ -12,3 +12,4 @@ 26-getprogname.patch 27-int-size.patch 28-valid-recipient.patch +29-double-free.patch -- 2.47.3