Check Maildir for not being NULL when expanding '='-paths. Closes #2977.

diff --git a/ChangeLog b/ChangeLog
index 1eba130940147ccc6eaa4d924573d1e9d30fc9c3..fc86e9b924a0492ec31fcf6d53158b5b57a53b4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-02 16:55 -0700  Pawel Dziekonski  <dzieko@pwr.wroc.pl>  (cc5de08f4612)
+
+       * po/pl.po: Updated Polish translation.
+
+2007-11-01 20:36 -0700  Petr Pisar  <petr.pisar@atlas.cz>  (0b4bd0452b5a)
+
+       * ChangeLog, po/cs.po: Updated Czech translation.
+
 2007-11-01 15:45 -0700  Brendan Cully  <brendan@kublai.com>  (5123cded9988)
 
        * configure.ac: Use $datarootdir as default prefix for documentation

diff --git a/muttlib.c b/muttlib.c
index 5e7a6791d5650f8810a9b2b495aa9c5a27ce9f91..46e074819c003fdb8bd9b78f4a678c826cf0d85a 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -397,7 +397,7 @@ char *_mutt_expand_path (char *s, size_t slen, int rx)
          strfcpy (p, NONULL (Maildir), sizeof (p));
        else
 #endif
-       if (Maildir[strlen (Maildir) - 1] == '/')
+       if (Maildir && *Maildir && Maildir[strlen (Maildir) - 1] == '/')
          strfcpy (p, NONULL (Maildir), sizeof (p));
        else
          snprintf (p, sizeof (p), "%s/", NONULL (Maildir));