r1640 - in /unstable/evolution/debian: changelog patches/03_fix-segfault-on-some-mails-display.patch

[corsac at users.alioth.debian.org]

Author: corsac
Date: Thu May 20 20:21:39 2010
New Revision: 1640

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1640
Log:
* debian/patches
  - 03_fix-segfault-on-some-mails-display added.              closes: #580419

Added:
    unstable/evolution/debian/patches/03_fix-segfault-on-some-mails-display.patch
Modified:
    unstable/evolution/debian/changelog

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1640&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Thu May 20 20:21:39 2010
@@ -1,3 +1,10 @@
+evolution (2.30.1.2-3) UNRELEASED; urgency=low
+
+  * debian/patches
+    - 03_fix-segfault-on-some-mails-display added.              closes: #580419
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 20 May 2010 22:06:41 +0200
+
 evolution (2.30.1.2-2) unstable; urgency=low
 
   * debian/rules:

Added: unstable/evolution/debian/patches/03_fix-segfault-on-some-mails-display.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/03_fix-segfault-on-some-mails-display.patch?rev=1640&op=file
==============================================================================
--- unstable/evolution/debian/patches/03_fix-segfault-on-some-mails-display.patch (added)
+++ unstable/evolution/debian/patches/03_fix-segfault-on-some-mails-display.patch Thu May 20 20:21:39 2010
@@ -1,0 +1,29 @@
+commit cacfd2114e7dd56cc12613d625bac450cc69b4ae
+Author: Michel Dänzer <michel at daenzer.net>
+Date:   Wed Mar 24 16:51:31 2010 +0100
+
+    Bug 612082 - Crash in em_format_snoop_type
+    
+    This is not a final solution to the bug, but merely avoids a NULL
+    pointer dereference which is likely a symptom of a deeper problem.
+    
+    Signed-off-by: Michel Dänzer <michel at daenzer.net>
+
+diff --git a/em-format/em-format.c b/em-format/em-format.c
+index 19913ef..a2034b4 100644
+--- a/em-format/em-format.c
++++ b/em-format/em-format.c
+@@ -2015,10 +2015,11 @@ em_format_snoop_type (CamelMimePart *part)
+ 
+ 	dw = camel_medium_get_content_object((CamelMedium *)part);
+ 	if (!camel_data_wrapper_is_offline(dw)) {
+-		CamelStreamMem *mem = (CamelStreamMem *)camel_stream_mem_new();
++		GByteArray *buffer = g_byte_array_new ();
++		CamelStreamMem *mem = (CamelStreamMem *)camel_stream_mem_new_with_byte_array(buffer);
+ 
+ 		if (camel_data_wrapper_decode_to_stream(dw, (CamelStream *)mem) > 0) {
+-			gchar *ct = g_content_type_guess (filename, mem->buffer->data, mem->buffer->len, NULL);
++			gchar *ct = g_content_type_guess (filename, buffer->data, buffer->len, NULL);
+ 
+ 			if (ct)
+ 				magic_type = g_content_type_get_mime_type (ct);