From: Rocco Rutte <pdmef@gmx.net>
Date: Sat, 3 Nov 2007 10:12:19 +0000 (+0100)
Subject: Check Maildir for not being NULL when expanding '='-paths. Closes #2977.
X-Git-Tag: mutt-1-5-18-rel~102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68a5c91156c061066fdd62cf990167a17fa1fd89;p=mutt

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

diff --git a/ChangeLog b/ChangeLog
index 1eba1309..fc86e9b9 100644
--- 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 5e7a6791..46e07481 100644
--- 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));