Merge trunk rev. 5015: fix a double-free bug.

diff --git a/changelog b/changelog
index 8eab598bbdca767c820fd55f70661fa5ecd08876..770ff7b86dfc4dee81eb6ab962a2fcfd25b662b2 100644 (file)
--- 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 (file)
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 <roam@ringlet.net>
+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 e60f17d796bdf174a846204a0231398f43a5110a..d33186412661a9f518381bce0810a0b2f6e0577a 100644 (file)
--- 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