Re: [evolution-patches] fix for mailer bug #66703

[Not Zed <notzed ximian com>]

looks good.

On Fri, 2004-10-08 at 14:33 -0400, Jeffrey Stedfast wrote:

http://bugzilla.ximian.com/show_bug.cgi?id=66703

Jeff

text/plain attachment (66703.patch)

? 66703.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
retrieving revision 1.657.2.2
diff -u -r1.657.2.2 ChangeLog
--- ChangeLog	20 Sep 2004 15:30:49 -0000	1.657.2.2
+++ ChangeLog	8 Oct 2004 18:32:17 -0000
@@ -1,3 +1,9 @@
+2004-10-08  Jeffrey Stedfast  <fejj novell com>
+
+	* e-msg-composer.c (build_message): g_strdup() the gpg/smime keys
+	into the recipients list or else we end up free'ing them later
+	when we shouldn't. Fixes bug #66703
+
 2004-08-17  Michael Meeks  <michael ximian com>
 
 	* e-msg-composer.c (handle_mailto): handle 'attachment' as
Index: e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.479.2.1
diff -u -r1.479.2.1 e-msg-composer.c
--- e-msg-composer.c	20 Sep 2004 15:30:49 -0000	1.479.2.1
+++ e-msg-composer.c	8 Oct 2004 18:32:17 -0000
@@ -661,7 +661,7 @@
 
 			/* check to see if we should encrypt to self, NB gets removed immediately after use */
 			if (hdrs->account && hdrs->account->pgp_encrypt_to_self && pgp_userid)
-				g_ptr_array_add (recipients, (char *)pgp_userid);
+				g_ptr_array_add (recipients, g_strdup (pgp_userid));
 
 			cipher = mail_crypto_get_pgp_cipher_context (hdrs->account);
 			camel_cipher_encrypt(cipher, pgp_userid, recipients, part, npart, &ex);
@@ -740,7 +740,7 @@
 		if (composer->smime_encrypt) {
 			/* check to see if we should encrypt to self, NB removed after use */
 			if (hdrs->account->smime_encrypt_to_self)
-				g_ptr_array_add(recipients, hdrs->account->smime_encrypt_key);
+				g_ptr_array_add(recipients, g_strdup (hdrs->account->smime_encrypt_key));
 
 			cipher = camel_smime_context_new(session);
 			camel_smime_context_set_encrypt_key((CamelSMIMEContext *)cipher, TRUE, hdrs->account->smime_encrypt_key);