+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
( 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
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=76
+EXTRA_VERSION=77
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
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';
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';
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);
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);