2004-11-17 [colin] 0.9.12cvs150.1

	* src/plugins/pgpmime/pgpmime.c
		Sync with HEAD (off-by-one fix)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 377b13b7812bba293b2c06a6e89d9828ba8caf58..c33f9a808246f175d35b8ead7f09199045d3db74 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-11-17 [colin]     0.9.12cvs150.1
+
+       * src/plugins/pgpmime/pgpmime.c
+               Sync with HEAD (off-by-one fix)
+
 2004-11-17 [colin]     0.9.12cvs149.1
 
        * src/procmsg.c

diff --git a/PATCHSETS b/PATCHSETS
index 74ec376aa01052f8c09da85193a165bc26546704..42e6044a3b29f54f185fe9e5cee0ac38b3784e54 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -242,3 +242,4 @@
 ( cvs diff -u -r 1.150.2.12 -r 1.150.2.13 src/procmsg.c; ) > 0.9.12cvs147.1.patchset
 ( cvs diff -u -r 1.150.2.13 -r 1.150.2.14 src/procmsg.c; ) > 0.9.12cvs148.1.patchset
 ( cvs diff -u -r 1.150.2.14 -r 1.150.2.15 src/procmsg.c; ) > 0.9.12cvs149.1.patchset
+( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs150.1.patchset

diff --git a/configure.ac b/configure.ac
index a0fa0574512cfcca4c0bb19629b2daf6a1225833..94003354f3036beb009f8d5acf2d1e578b565dc6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=149
+EXTRA_VERSION=150
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c
index d027c75631a4e7f3972097232b2e681cb8cc34bd..60db612fe36693862f15d0badeffe0c91c93f59b 100644 (file)
--- a/src/plugins/pgpmime/pgpmime.c
+++ b/src/plugins/pgpmime/pgpmime.c
@@ -566,7 +566,7 @@ gboolean pgpmime_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
        newinfo->type = MIMETYPE_APPLICATION;
        newinfo->subtype = g_strdup("octet-stream");
        newinfo->content = MIMECONTENT_MEM;
-       newinfo->data.mem = g_malloc(len);
+       newinfo->data.mem = g_malloc(len + 1);
        g_memmove(newinfo->data.mem, enccontent, len);
        newinfo->data.mem[len] = '\0';
        g_node_append(encmultipart->node, newinfo->node);