[88607] trunk/dports/mail/mutt-devel

[jmr at macports.org]

Revision: 88607
          http://trac.macports.org/changeset/88607
Author:   jmr at macports.org
Date:     2012-01-05 13:09:10 -0800 (Thu, 05 Jan 2012)
Log Message:
-----------
mutt-devel: add upstream patch to fix segfault (#28269)

Modified Paths:
--------------
    trunk/dports/mail/mutt-devel/Portfile

Added Paths:
-----------
    trunk/dports/mail/mutt-devel/files/1a4c43138685.diff

Modified: trunk/dports/mail/mutt-devel/Portfile
===================================================================
--- trunk/dports/mail/mutt-devel/Portfile	2012-01-05 20:55:40 UTC (rev 88606)
+++ trunk/dports/mail/mutt-devel/Portfile	2012-01-05 21:09:10 UTC (rev 88607)
@@ -5,7 +5,7 @@
 
 name                mutt-devel
 version             1.5.21 
-revision            1
+revision            2
 categories          mail
 platforms           darwin
 license             GPL-2
@@ -34,6 +34,8 @@
                     port:ncurses
 
 patch.args          -p1
+# upstream changeset to fix segfault, ticket #28269
+patchfiles          1a4c43138685.diff
 
 configure.args      --disable-warnings \
                     --mandir=${prefix}/share/man \

Added: trunk/dports/mail/mutt-devel/files/1a4c43138685.diff
===================================================================
--- trunk/dports/mail/mutt-devel/files/1a4c43138685.diff	                        (rev 0)
+++ trunk/dports/mail/mutt-devel/files/1a4c43138685.diff	2012-01-05 21:09:10 UTC (rev 88607)
@@ -0,0 +1,23 @@
+
+# HG changeset patch
+# User Michael Elkins <me at mutt.org>
+# Date 1285942464 25200
+# Node ID 1a4c43138685b628dedb14932934ff392104ac72
+# Parent  c10f8863e979e6f7fa61649128e3b659b4cd8827
+fix segfault when $message_cachedir is set and opening a POP3 mailbox.
+
+fixes #3457
+
+diff -r c10f8863e979 -r 1a4c43138685 muttlib.c
+--- a/muttlib.c	Thu Sep 30 18:11:35 2010 -0700
++++ b/muttlib.c	Fri Oct 01 07:14:24 2010 -0700
+@@ -1960,6 +1960,7 @@
+ {
+   char *p = safe_strdup (src);
+   int rc = mutt_convert_string (&p, Charset, "utf-8", 0);
+-  strfcpy (dest, rc == 0 ? p : src, dlen);
++  /* `src' may be NULL, such as when called from the pop3 driver. */
++  strfcpy (dest, (rc == 0) ? NONULL(p) : NONULL(src), dlen);
+   FREE (&p);
+ }
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120105/29830092/attachment-0001.html>