From eb9eb39c9869817afca6b4dc052c21492932d2f9 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Wed, 15 Jun 2011 14:37:33 +0200
Subject: [PATCH] Fix few memory leaks

---
 camel/providers/imap/camel-imap-folder.c | 14 +++++++++++---
 camel/providers/imap/camel-imap-store.c  |  3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index d2a035e..17de53a 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -1014,6 +1014,7 @@ imap_rescan (CamelFolder *folder,
 		return FALSE;
 	}
 
+	resp = NULL;
 	new = g_malloc0 (summary_len * sizeof (*new));
 	summary_got = 0;
 	while ((type = camel_imap_command_response (store, &resp, cancellable, error)) == CAMEL_IMAP_RESPONSE_UNTAGGED && !camel_application_is_exiting) {
@@ -1023,6 +1024,7 @@ imap_rescan (CamelFolder *folder,
 
 		data = parse_fetch_response (imap_folder, resp);
 		g_free (resp);
+		resp = NULL;
 		if (!data)
 			continue;
 
@@ -1048,6 +1050,8 @@ imap_rescan (CamelFolder *folder,
 		camel_operation_pop_message (cancellable);
 		camel_service_unlock (CAMEL_SERVICE (store), CAMEL_SERVICE_REC_CONNECT_LOCK);
 		g_free (new);
+		g_free (resp);
+
 		return TRUE;
 	}
 
@@ -1059,6 +1063,7 @@ imap_rescan (CamelFolder *folder,
 			g_free (new[i].custom_flags);
 		}
 		g_free (new);
+		g_free (resp);
 
 		if (type != CAMEL_IMAP_RESPONSE_ERROR && type != CAMEL_IMAP_RESPONSE_TAGGED)
 			camel_service_unlock (CAMEL_SERVICE (store), CAMEL_SERVICE_REC_CONNECT_LOCK);
@@ -3932,7 +3937,7 @@ imap_update_summary (CamelFolder *folder,
 			if (store->custom_headers)
 				header_spec = g_string_append (header_spec, store->custom_headers);
 
-			temp = g_strdup (header_spec->str);
+			temp = g_string_free (header_spec, FALSE);
 			temp = g_strstrip (temp);
 			header_spec = g_string_new (temp);
 			g_free (temp);
@@ -4022,6 +4027,7 @@ imap_update_summary (CamelFolder *folder,
 		if (type != CAMEL_IMAP_RESPONSE_ERROR && type != CAMEL_IMAP_RESPONSE_TAGGED)
 			camel_service_unlock (service, CAMEL_SERVICE_REC_CONNECT_LOCK);
 
+		g_string_free (header_spec, TRUE);
 		goto lose;
 	}
 
@@ -4090,6 +4096,7 @@ imap_update_summary (CamelFolder *folder,
 
 			if (type == CAMEL_IMAP_RESPONSE_ERROR || camel_application_is_exiting) {
 				g_ptr_array_free (needheaders, TRUE);
+				g_string_free (header_spec, TRUE);
 				camel_operation_pop_message (cancellable);
 
 				if (type != CAMEL_IMAP_RESPONSE_ERROR && type != CAMEL_IMAP_RESPONSE_TAGGED)
@@ -4098,11 +4105,12 @@ imap_update_summary (CamelFolder *folder,
 				goto lose;
 			}
 		}
-		g_string_free (header_spec, TRUE);
-		g_ptr_array_free (needheaders, TRUE);
 		camel_operation_pop_message (cancellable);
 	}
 
+	g_ptr_array_free (needheaders, TRUE);
+	g_string_free (header_spec, TRUE);
+
 	/* Now finish up summary entries (fix UIDs, set flags and size) */
 	for (i = 0; i < fetch_data->len; i++) {
 		struct _junk_data jdata;
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index fb9f5aa..15ff0c1 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -2602,9 +2602,9 @@ get_folders_sync (CamelImapStore *imap_store,
 
 			if (!ppattern) {
 				if (!ns->full_name || !*ns->full_name) {
-					tmp = g_strdup ("*");
 					if (k == 1)
 						break;
+					tmp = g_strdup ("*");
 				} else if (k == 0)
 					tmp = g_strdup_printf ("%s%c", ns->full_name, ns->sep);
 				else
@@ -2618,6 +2618,7 @@ get_folders_sync (CamelImapStore *imap_store,
 								pattern);
 				if (!response) {
 					success = FALSE;
+					g_free (tmp);
 					goto fail;
 				}
 
-- 
2.7.4