r2357 - in /experimental/evolution-data-server/debian: changelog patches/ patches/imapx_fix_memleak.patch patches/series

[jordi at users.alioth.debian.org]

Author: jordi
Date: Sun Mar 31 02:18:50 2013
New Revision: 2357

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2357
Log:
Add imapx_fix_memleak.patch: fix for memory leak in IMAPx.

Added:
    experimental/evolution-data-server/debian/patches/
    experimental/evolution-data-server/debian/patches/imapx_fix_memleak.patch
    experimental/evolution-data-server/debian/patches/series
Modified:
    experimental/evolution-data-server/debian/changelog

Modified: experimental/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/changelog?rev=2357&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/changelog (original)
+++ experimental/evolution-data-server/debian/changelog Sun Mar 31 02:18:50 2013
@@ -2,8 +2,9 @@
 
   * New upstream release.
   * Drop imapx_dont_remove_folders_on_error.patch, included in this version.
-
- -- Jordi Mallach <jordi at debian.org>  Sun, 31 Mar 2013 04:03:42 +0200
+  * Add imapx_fix_memleak.patch: fix for memory leak in IMAPx.
+
+ -- Jordi Mallach <jordi at debian.org>  Sat, 30 Mar 2013 21:19:10 -0500
 
 evolution-data-server (3.7.92-1) experimental; urgency=low
 

Added: experimental/evolution-data-server/debian/patches/imapx_fix_memleak.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/patches/imapx_fix_memleak.patch?rev=2357&op=file
==============================================================================
--- experimental/evolution-data-server/debian/patches/imapx_fix_memleak.patch (added)
+++ experimental/evolution-data-server/debian/patches/imapx_fix_memleak.patch Sun Mar 31 02:18:50 2013
@@ -1,0 +1,64 @@
+From d3e1fe4060015aa1aac4bfe730a49f0de05b3c38 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Mon, 25 Mar 2013 13:42:20 +0000
+Subject: Bug #656488 - imapx: Memory leak of mi->server_user_flags
+
+---
+diff --git a/camel/camel-imapx-server.c b/camel/camel-imapx-server.c
+index 6d0893f..b185aea 100644
+--- a/camel/camel-imapx-server.c
++++ b/camel/camel-imapx-server.c
+@@ -2324,6 +2324,9 @@ imapx_untagged_bye (CamelIMAPXServer *is,
+ 			error, CAMEL_IMAPX_ERROR, 1,
+ 			"IMAP server said BYE: %s", token);
+ 	}
++
++	g_free (token);
++
+ 	is->state = IMAPX_SHUTDOWN;
+ 
+ 	return FALSE;
+diff --git a/camel/camel-imapx-summary.c b/camel/camel-imapx-summary.c
+index 0656380..c0042c7 100644
+--- a/camel/camel-imapx-summary.c
++++ b/camel/camel-imapx-summary.c
+@@ -63,6 +63,11 @@ imapx_message_info_clone (CamelFolderSummary *s,
+ 
+ 	to = (CamelIMAPXMessageInfo *)
+ 		folder_summary_class->message_info_clone (s, mi);
++	if (from->server_user_flags) {
++		CamelIMAPXMessageInfo *xfrom = (CamelIMAPXMessageInfo *) from;
++
++		camel_flag_list_copy (&to->server_user_flags, &xfrom->server_user_flags);
++	}
+ 	to->server_flags = from->server_flags;
+ 
+ 	/* FIXME: parent clone should do this */
+@@ -72,6 +77,17 @@ imapx_message_info_clone (CamelFolderSummary *s,
+ }
+ 
+ static void
++imapx_message_info_free (CamelFolderSummary *summary,
++			 CamelMessageInfo *mi)
++{
++	CamelIMAPXMessageInfo *xinfo = (CamelIMAPXMessageInfo *) mi;
++
++	camel_flag_list_free (&xinfo->server_user_flags);
++
++	CAMEL_FOLDER_SUMMARY_CLASS (camel_imapx_summary_parent_class)->message_info_free (summary, mi);
++}
++
++static void
+ camel_imapx_summary_class_init (CamelIMAPXSummaryClass *class)
+ {
+ 	CamelFolderSummaryClass *folder_summary_class;
+@@ -80,6 +96,7 @@ camel_imapx_summary_class_init (CamelIMAPXSummaryClass *class)
+ 	folder_summary_class->message_info_size = sizeof (CamelIMAPXMessageInfo);
+ 	folder_summary_class->content_info_size = sizeof (CamelIMAPXMessageContentInfo);
+ 	folder_summary_class->message_info_clone = imapx_message_info_clone;
++	folder_summary_class->message_info_free = imapx_message_info_free;
+ 	folder_summary_class->summary_header_to_db = summary_header_to_db;
+ 	folder_summary_class->summary_header_from_db = summary_header_from_db;
+ 	folder_summary_class->message_info_to_db = message_info_to_db;
+--
+cgit v0.9.1

Added: experimental/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/patches/series?rev=2357&op=file
==============================================================================
--- experimental/evolution-data-server/debian/patches/series (added)
+++ experimental/evolution-data-server/debian/patches/series Sun Mar 31 02:18:50 2013
@@ -1,0 +1,1 @@
+imapx_fix_memleak.patch