r1668 - in /unstable/evolution/debian: changelog patches/03_fix-crash-itip.patch patches/series

[corsac at users.alioth.debian.org]

Author: corsac
Date: Tue Jun 22 16:04:28 2010
New Revision: 1668

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1668
Log:
03_fix-crash-itip added, fix crash in ITIP parser.        closes: #584661

Added:
    unstable/evolution/debian/patches/03_fix-crash-itip.patch
Modified:
    unstable/evolution/debian/changelog
    unstable/evolution/debian/patches/series

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1668&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Tue Jun 22 16:04:28 2010
@@ -3,7 +3,6 @@
   * New upstream release.
     - fix message deleting in search folers.                    closes: #585794
     - fix crash on i386 with largefile.                         closes: #585921
-    - fix crash in ITIP parser.                                 closes: #584661
   * debian/rules:
     - install some information on bug reporting
   * debian/bug-presubj: warn user that she should report upstream issues
@@ -12,12 +11,13 @@
     - 03_fix-segfault-on-some-mails-display, 
       04_fix-crash-when-viewing-closing-mails-quickly  dropped, 
       included upstream.
+    - 03_fix-crash-itip added, fix crash in ITIP parser.        closes: #584661
   * debian/control:
     - update build-deps to 2.30.2.
     - update debhelper build-dep to 7.2.3 for dh_bugfiles.
   * Switch to 3.0 (quilt) format.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 22 Jun 2010 07:39:34 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 22 Jun 2010 17:23:27 +0200
 
 evolution (2.30.1.2-3) unstable; urgency=low
 

Added: unstable/evolution/debian/patches/03_fix-crash-itip.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/03_fix-crash-itip.patch?rev=1668&op=file
==============================================================================
--- unstable/evolution/debian/patches/03_fix-crash-itip.patch (added)
+++ unstable/evolution/debian/patches/03_fix-crash-itip.patch Tue Jun 22 16:04:28 2010
@@ -1,0 +1,29 @@
+diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
+index 526af07..e5a4b1d 100644
+--- a/plugins/itip-formatter/itip-formatter.c
++++ b/plugins/itip-formatter/itip-formatter.c
+@@ -2536,6 +2536,7 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
+ 	struct _itip_puri *puri;
+ 	CamelDataWrapper *content;
+ 	CamelStream *mem;
++	GByteArray *buffer = g_byte_array_new ();
+ 
+ 	classid = g_strdup_printf("itip:///%s", ((EMFormat *) target->format)->part_id->str);
+ 
+@@ -2561,13 +2562,13 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
+ 
+ 	/* This is non-gui thread. Download the part for using in the main thread */
+ 	content = camel_medium_get_content_object ((CamelMedium *) target->part);
+-	mem = camel_stream_mem_new ();
++	mem = camel_stream_mem_new_with_byte_array (buffer);
+ 	camel_data_wrapper_decode_to_stream (content, mem);
+ 
+-	if (((CamelStreamMem *) mem)->buffer->len == 0)
++	if (buffer->len == 0)
+ 		puri->vcalendar = NULL;
+ 	else
+-		puri->vcalendar = g_strndup ((gchar *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len);
++		puri->vcalendar = g_strndup ((gchar *)buffer->data, buffer->len);
+ 	camel_object_unref (mem);
+ 
+ 	camel_stream_printf (target->stream, "<table border=0 width=\"100%%\" cellpadding=3><tr>");

Modified: unstable/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/series?rev=1668&op=diff
==============================================================================
--- unstable/evolution/debian/patches/series (original)
+++ unstable/evolution/debian/patches/series Tue Jun 22 16:04:28 2010
@@ -1,2 +1,3 @@
 01_dont-ship-evo-mail-notifier.png.patch
 02_let-nss-search-for-nssckbi.patch
+03_fix-crash-itip.patch