aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/upgrade-mailer.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 076f63a5d1..cf7bfd7704 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-25 Jeffrey Stedfast <fejj@ximian.com>
+
+ * upgrade-mailer.c (imap_url_upgrade): NULL-check si->folders
+ before passing it into find_folder so we don't crash. Fixes bug
+ #30915.
+
2002-09-24 Jeffrey Stedfast <fejj@ximian.com>
* folder-browser-ui.c: Allow users to delete already deleted
diff --git a/mail/upgrade-mailer.c b/mail/upgrade-mailer.c
index aa9127378e..8d258ce997 100644
--- a/mail/upgrade-mailer.c
+++ b/mail/upgrade-mailer.c
@@ -505,7 +505,7 @@ imap_url_upgrade (GHashTable *imap_sources, const char *uri)
p = hex_decode (p, strlen (p));
fprintf (stderr, "checking for folder %s on %s... ", p, base_url);
- folder = find_folder (si->folders, p, &dir_sep);
+ folder = si->folders ? find_folder (si->folders, p, &dir_sep) : NULL;
if (folder == NULL) {
fprintf (stderr, "not found.\n");
folder = p;