diff options
| author | Peter Williams <peterw@ximian.com> | 2001-08-14 06:31:20 +0800 |
|---|---|---|
| committer | Peter Williams <peterw@src.gnome.org> | 2001-08-14 06:31:20 +0800 |
| commit | 23aba87f9bbeb4fe8c54e499cce4059078bb3598 (patch) | |
| tree | 324048b714e2ee6e3a13fd1ccc1170cb78ee2199 /camel/providers/imap/camel-imap-utils.c | |
| parent | 778f9780befd1f8f5514c64001c88d5b2e3292ba (diff) | |
| download | gsoc2013-evolution-23aba87f9bbeb4fe8c54e499cce4059078bb3598.tar.gz gsoc2013-evolution-23aba87f9bbeb4fe8c54e499cce4059078bb3598.tar.zst gsoc2013-evolution-23aba87f9bbeb4fe8c54e499cce4059078bb3598.zip | |
Fix a leak.
2001-08-13 Peter Williams <peterw@ximian.com>
* providers/imap/camel-imap-store.c (delete_folder): Fix a leak.
* providers/imap/camel-imap-utils.c (imap_namespace_concat): Bleah,
handle when namespace = NULL (can happen upon initial open of mailbox.)
* providers/imap/camel-imap-command.c (imap_command_strdup_vprintf):
Don't crash when %F'ing with an empty folder name and NULL namespace.
svn path=/trunk/; revision=11971
Diffstat (limited to 'camel/providers/imap/camel-imap-utils.c')
| -rw-r--r-- | camel/providers/imap/camel-imap-utils.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c index a449ea228d..df8ddc4f0e 100644 --- a/camel/providers/imap/camel-imap-utils.c +++ b/camel/providers/imap/camel-imap-utils.c @@ -773,11 +773,20 @@ imap_concat (CamelImapStore *imap_store, const char *prefix, const char *suffix) char * imap_namespace_concat (CamelImapStore *store, const char *name) { - if (!name || *name == '\0') - return g_strdup (store->namespace); - + if (!name || *name == '\0') { + if (store->namespace) + return g_strdup (store->namespace); + else + return g_strdup (""); + } + if (!g_strcasecmp (name, "INBOX")) return g_strdup ("INBOX"); + if (store->namespace == NULL) { + g_warning ("Trying to concat NULL namespace to \"%s\"!", name); + return g_strdup (name); + } + return imap_concat (store, store->namespace, name); } |