From b38af14a3d7f8262624e8ed97d87f08990ba510e Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Wed, 25 Sep 2002 21:15:44 +0000 Subject: NULL-check si->folders before passing it into find_folder so we don't 2002-09-25 Jeffrey Stedfast * upgrade-mailer.c (imap_url_upgrade): NULL-check si->folders before passing it into find_folder so we don't crash. Fixes bug #30915. svn path=/trunk/; revision=18218 --- mail/ChangeLog | 6 ++++++ mail/upgrade-mailer.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + + * 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 * 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; -- cgit