[evolution/webkit: 84/171] Fix a few memory leaks in EMailDisplay, EMailRequest and EFHP

[Dan VrÃtil <dvratil src gnome org>]

commit 8cb33ae9949c442e0dda8ec0904a8e8cc68643d4
Author: Dan VrÃtil <dvratil redhat com>
Date:   Fri Dec 16 17:10:14 2011 +0100

    Fix a few memory leaks in EMailDisplay, EMailRequest and EFHP

 mail/e-mail-display.c       |    3 +-
 mail/e-mail-request.c       |   48 +++++++++++++++++++++++++++++-------------
 mail/em-format-html-print.c |   12 +++++++++-
 3 files changed, 45 insertions(+), 18 deletions(-)
---
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 07bf0c8..0b3dc4c 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -460,6 +460,7 @@ mail_display_webkit_finished (GObject *object,
 				add_resource_to_cache (subresource);	
 		}
 	}
+	g_list_free (subresources);
 }
 
 
@@ -1018,7 +1019,7 @@ e_mail_display_set_headers_collapsable (EMailDisplay *display,
 	display->priv->headers_collapsable = collapsable;
 	e_mail_display_reload (display);
 
-	g_object_notify (G_OBJECT (display), "header-collapsable");
+	g_object_notify (G_OBJECT (display), "headers-collapsable");
 }
 
 gboolean
diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c
index 5b0c03c..593e12d 100644
--- a/mail/e-mail-request.c
+++ b/mail/e-mail-request.c
@@ -1,6 +1,7 @@
 #define LIBSOUP_USE_UNSTABLE_REQUEST_API
 
 #include "e-mail-request.h"
+
 #include <libsoup/soup.h>
 #include <glib/gi18n.h>
 #include <camel/camel.h>
@@ -8,6 +9,7 @@
 #include "em-format-html.h"
 
 #define d(x)
+#define dd(x)
 
 G_DEFINE_TYPE (EMailRequest, e_mail_request, SOUP_TYPE_REQUEST)
 
@@ -21,6 +23,9 @@ struct _EMailRequestPrivate {
 	gint content_length;
 
 	GHashTable *uri_query;
+
+        gchar *ret_data;
+        gchar *ret_mime_type;
 };
 
 static void
@@ -38,8 +43,9 @@ start_mail_formatting (GSimpleAsyncResult *res,
 	if (g_cancellable_is_cancelled (cancellable))
 		return;
 
-	if (request->priv->output_stream != NULL)
+	if (request->priv->output_stream != NULL) {
 		g_object_unref (request->priv->output_stream);
+	}
 
 	request->priv->output_stream = camel_stream_mem_new ();
 
@@ -77,11 +83,13 @@ start_mail_formatting (GSimpleAsyncResult *res,
 
 	/* Convert the GString to GInputStream and send it back to WebKit */
 	ba = camel_stream_mem_get_byte_array (CAMEL_STREAM_MEM (request->priv->output_stream));
-
 	if (!ba->data) {
 		gchar *data = g_strdup_printf(_("Failed to load part '%s'"), part_id);
+		dd(printf("%s", data));
 		g_byte_array_append (ba, (guchar*) data, strlen (data));
 		g_free (data);
+	} else {
+		dd(printf("%s", ba->data));
 	}
 
 	stream = g_memory_input_stream_new_from_data ((gchar*) ba->data, ba->len, NULL);
@@ -112,9 +120,7 @@ get_file_content (GSimpleAsyncResult *res,
 		stream = g_memory_input_stream_new_from_data (contents, length, NULL);
 		g_simple_async_result_set_op_res_gpointer (res, stream, NULL);
 
-		/* FIXME - Freeing the data empties the result stream, but without it
-		   the #contents leaks memory */
-		//g_free (contents);
+                request->priv->ret_data = contents;
 	}
 }
 
@@ -122,7 +128,7 @@ static void
 e_mail_request_init (EMailRequest *request)
 {
 	request->priv = G_TYPE_INSTANCE_GET_PRIVATE (
-		request, E_TYPE_MAIL_REQUEST, EMailRequestPrivate);
+	        request, E_TYPE_MAIL_REQUEST, EMailRequestPrivate);
 
 	request->priv->efh = NULL;
 	request->priv->output_stream = NULL;
@@ -152,6 +158,16 @@ mail_request_finalize (GObject *object)
 		request->priv->uri_query = NULL;
 	}
 
+	if (request->priv->ret_mime_type) {
+                g_free (request->priv->ret_mime_type);
+                request->priv->ret_mime_type = NULL;
+        }
+
+        if (request->priv->ret_data) {
+                g_free (request->priv->ret_data);
+                request->priv->ret_data = NULL;
+        }
+
 	G_OBJECT_CLASS (e_mail_request_parent_class)->finalize (object);
 }
 
@@ -168,7 +184,7 @@ static void
 mail_request_send_async (SoupRequest *request,
 			 GCancellable *cancellable,
 			 GAsyncReadyCallback callback,
-			 gpointer	user_data)
+			 gpointer user_data)
 {
 	SoupSession *session;
 	EMailRequest *emr = E_MAIL_REQUEST (request);
@@ -245,19 +261,21 @@ static const gchar*
 mail_request_get_content_type (SoupRequest *request)
 {
 	EMailRequest *emr = E_MAIL_REQUEST (request);
-	const gchar *mime_type;
+	gchar *mime_type;
 
-	if (emr->priv->mime_type)
-		mime_type = emr->priv->mime_type;
-	else if (!emr->priv->puri)
-		mime_type = "text/html";
-	else if (!emr->priv->puri->mime_type) {
+	if (emr->priv->mime_type) {
+		mime_type = g_strdup (emr->priv->mime_type);
+	} else if (!emr->priv->puri) {
+		mime_type = g_strdup ("text/html");
+	} else if (!emr->priv->puri->mime_type) {
 		CamelContentType *ct = camel_mime_part_get_content_type (emr->priv->puri->part);
 		mime_type = camel_content_type_format (ct);
-	} else
-		mime_type = emr->priv->puri->mime_type;
+	} else {
+		mime_type = g_strdup (emr->priv->puri->mime_type);
+	}
 
 	d(printf("Content-Type: %s\n", mime_type));
+        emr->priv->ret_mime_type = mime_type;
 	return mime_type;
 }
 
diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c
index 520326d..46aebad 100644
--- a/mail/em-format-html-print.c
+++ b/mail/em-format-html-print.c
@@ -248,6 +248,7 @@ efhp_write_headers (EMFormat *emf,
 
 	camel_stream_write_string (stream, str->str, cancellable, NULL);
 	g_string_free (str, TRUE);
+        g_free (puri_prefix);
 }
 
 static void
@@ -370,6 +371,11 @@ efhp_finalize (GObject *object)
 		efhp->priv->top_level_puri = NULL;
 	}
 
+	if (efhp->priv->attachments) {
+                g_list_free (efhp->priv->attachments);
+                efhp->priv->attachments = NULL;
+        }
+
 	/* Chain up to parent's finalize() method. */
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -402,8 +408,10 @@ efhp_set_orig_formatter (EMFormatHTMLPrint *efhp,
 
 	/* Make a shallow copy of the table. This table will NOT destroy
 	 * the PURIs when free'd! */
-	emfp->mail_part_table = 
-		g_hash_table_new (g_str_hash, g_str_equal);
+        if (emfp->mail_part_table)
+                g_hash_table_unref (emfp->mail_part_table);
+
+	emfp->mail_part_table = g_hash_table_new (g_str_hash, g_str_equal);
 	g_hash_table_iter_init (&iter, emfs->mail_part_table);
 	while (g_hash_table_iter_next (&iter, &key, &value))
 		g_hash_table_insert (emfp->mail_part_table, key, value);