[evolution-data-server/meego-eds] Fix stray unref of server in imapx add_folders_to_summary()



commit dc8d554b4047efb0cc5dee5759be8fac0ef294fa
Author: David Woodhouse <David Woodhouse intel com>
Date:   Thu Jul 28 17:25:38 2011 +0100

    Fix stray unref of server in imapx add_folders_to_summary()
    
    This was causing a double (well, multiple) free and use-after-free of the
    server; it has no business here.
    
    It was actually seen when a broken Yahoo server gave a namespace with NIL
    for the dir_sep, thus causing problems with subfolders.
    (cherry picked from commit c3460e79201ba988500014386dbc3f8781dbc5f3)

 camel/providers/imapx/camel-imapx-store.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/camel/providers/imapx/camel-imapx-store.c b/camel/providers/imapx/camel-imapx-store.c
index 782a808..7b35429 100644
--- a/camel/providers/imapx/camel-imapx-store.c
+++ b/camel/providers/imapx/camel-imapx-store.c
@@ -1047,10 +1047,8 @@ add_folders_to_summary (CamelIMAPXStore *istore, CamelIMAPXServer *server, GPtrA
 		}
 
 		si = camel_imapx_store_summary_add_from_full (istore->summary, li->name, li->separator);
-		if (!si) {
-			g_object_unref(server);
+		if (!si)
 			continue;
-		}
 
 		new_flags = (si->info.flags & (CAMEL_STORE_INFO_FOLDER_SUBSCRIBED | CAMEL_STORE_INFO_FOLDER_CHECK_FOR_NEW)) |
 						(li->flags & ~CAMEL_STORE_INFO_FOLDER_SUBSCRIBED);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]