mutt_buffer_printf: NULL dptr means use data

diff --git a/ChangeLog b/ChangeLog
index 6f385479594486d219aad619c8d854d3d6ee5255..4e81ea900364c640590180f8e208b17d2d16a79d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-08 14:52 -0800  Brendan Cully  <brendan@kublai.com>  (8ec606f6cafb)
+
+       * pattern.c: If regcomp fails, assume rx has not been allocated. Fixes
+       a core dump for save-hook '~f foo\.bar@(something|other)\.com' =foo.
+
+2010-03-02 11:31 -0800  TAKAHASHI Tamotsu  <ttakah@lapis.plala.or.jp>  (fec2720ff6ef)
+
+       * rfc822.c: Fix #2014. Thanks to Vincent Lefevre for help
+       with this one.
+
 2010-03-02 11:16 -0800  Brendan Cully  <brendan@kublai.com>  (41cf44ddbb4c)
 
        * copy.c: Fix thinko in [cc02f079b1b9]

diff --git a/muttlib.c b/muttlib.c
index a081abefe69a6622ff734bd25d59323b9b8066f5..fe3b7b4ab9662bf1bf2e67697aee75dbd53805d6 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -1675,6 +1675,9 @@ int mutt_buffer_printf (BUFFER* buf, const char* fmt, ...)
   va_start (ap, fmt);
   va_copy (ap_retry, ap);
 
+  if (!buf->dptr)
+    buf->dptr = buf->data;
+
   doff = buf->dptr - buf->data;
   blen = buf->dsize - doff;
   /* solaris 9 vsnprintf barfs when blen is 0 */