2006-06-03 [colin] 2.2.0cvs77

	* src/plugins/pgpinline/pgpinline.c
	* src/plugins/pgpmime/pgpmime.c
		Check that gpg_data_release_and_get_mem
		didn't fail (now, why this happens...)

diff --git a/ChangeLog b/ChangeLog
index 1431144b6ded0a2bcfc06304b05727ee466eb3cc..e9d941e68a42d23f30ff94d52b4d73d7ae9e5d84 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-03 [colin]     2.2.0cvs77
+
+       * src/plugins/pgpinline/pgpinline.c
+       * src/plugins/pgpmime/pgpmime.c
+               Check that gpg_data_release_and_get_mem 
+               didn't fail (now, why this happens...)
+
 2006-06-03 [colin]     2.2.0cvs76
 
        * src/mbox.c

diff --git a/PATCHSETS b/PATCHSETS
index 3e1eb202d716413c2c67174ac1893f70e670a26e..b0830d6f3bb459bde1f2c3af72c7ca7b59391661 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1546,3 +1546,4 @@
 ( cvs diff -u -r 1.115.2.88 -r 1.115.2.89 src/main.c;  cvs diff -u -r 1.150.2.65 -r 1.150.2.66 src/procmsg.c;  cvs diff -u -r 1.17.2.29 -r 1.17.2.30 src/send_message.c;  cvs diff -u -r 1.43.2.45 -r 1.43.2.46 src/toolbar.c;  ) > 2.2.0cvs74.patchset
 ( cvs diff -u -r 1.60.2.18 -r 1.60.2.19 src/filtering.c;  cvs diff -u -r 1.213.2.95 -r 1.213.2.96 src/folder.c;  cvs diff -u -r 1.150.2.66 -r 1.150.2.67 src/procmsg.c;  cvs diff -u -r 1.395.2.214 -r 1.395.2.215 src/summaryview.c;  ) > 2.2.0cvs75.patchset
 ( cvs diff -u -r 1.28.2.15 -r 1.28.2.16 src/mbox.c;  ) > 2.2.0cvs76.patchset
+( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/plugins/pgpmime/pgpmime.c;  ) > 2.2.0cvs77.patchset

diff --git a/configure.ac b/configure.ac
index 0b7c48384824695578d514e7f0b66488bf3af6ef..4eef17f1625943138bd3373e5dae0b4272f9c57f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=76
+EXTRA_VERSION=77
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpinline/pgpinline.c b/src/plugins/pgpinline/pgpinline.c
index c67219b499b3b5acd8c69521d19d032877855341..bf8a345d9a4ab9e173d9e532e13721c8a8a3ccae 100644 (file)
--- a/src/plugins/pgpinline/pgpinline.c
+++ b/src/plugins/pgpinline/pgpinline.c
@@ -517,8 +517,18 @@ static gboolean pgpinline_sign(MimeInfo *mimeinfo, PrefsAccount *account)
                return FALSE;
        }
 
-       gpgme_release(ctx);
        sigcontent = gpgme_data_release_and_get_mem(gpgsig, &len);
+       
+       gpgme_release(ctx);
+       
+       if (sigcontent == NULL || len <= 0) {
+               g_warning("gpgme_data_release_and_get_mem failed");
+               gpgme_data_release(gpgtext);
+               g_free(textstr);
+               g_free(sigcontent);
+               return FALSE;
+       }
+
        tmp = g_malloc(len+1);
        g_memmove(tmp, sigcontent, len+1);
        tmp[len] = '\0';
@@ -616,6 +626,13 @@ static gboolean pgpinline_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
        gpgme_release(ctx);
        enccontent = gpgme_data_release_and_get_mem(gpgenc, &len);
 
+       if (enccontent == NULL || len <= 0) {
+               g_warning("gpgme_data_release_and_get_mem failed");
+               gpgme_data_release(gpgtext);
+               g_free(textstr);
+               return FALSE;
+       }
+
        tmp = g_malloc(len+1);
        g_memmove(tmp, enccontent, len+1);
        tmp[len] = '\0';

diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c
index 3898427be740fd624222b00976985233ae279e1b..bce3ef5a7fa1d1164fb6ce52c58562ca5e51975b 100644 (file)
--- a/src/plugins/pgpmime/pgpmime.c
+++ b/src/plugins/pgpmime/pgpmime.c
@@ -486,6 +486,11 @@ gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account)
        gpgme_data_release(gpgtext);
        g_free(textstr);
 
+       if (sigcontent == NULL || len <= 0) {
+               g_warning("gpgme_data_release_and_get_mem failed");
+               return FALSE;
+       }
+
        /* add signature */
        g_hash_table_insert(sigmultipart->typeparameters, g_strdup("micalg"),
                             micalg);
@@ -590,6 +595,11 @@ gboolean pgpmime_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
        gpgme_data_release(gpgtext);
        g_free(textstr);
 
+       if (enccontent == NULL || len <= 0) {
+               g_warning("gpgme_data_release_and_get_mem failed");
+               return FALSE;
+       }
+
        /* create encrypted multipart */
        g_node_unlink(msgcontent->node);
        procmime_mimeinfo_free_all(msgcontent);