diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2002-09-26 05:15:44 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-09-26 05:15:44 +0800 |
| commit | b38af14a3d7f8262624e8ed97d87f08990ba510e (patch) | |
| tree | bdb99114cad9528efdac796806a4d705a54be66d | |
| parent | 7aaf603811ea4853f71edfbc407ed074588e6d5f (diff) | |
| download | gsoc2013-evolution-b38af14a3d7f8262624e8ed97d87f08990ba510e.tar.gz gsoc2013-evolution-b38af14a3d7f8262624e8ed97d87f08990ba510e.tar.zst gsoc2013-evolution-b38af14a3d7f8262624e8ed97d87f08990ba510e.zip | |
NULL-check si->folders before passing it into find_folder so we don't
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.
svn path=/trunk/; revision=18218
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/upgrade-mailer.c | 2 |
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; |