2007-03-03 [colin] 2.8.0cvs11

	* src/plugins/pgpinline/pgpinline.c
		Fix off-by-one, fix double-free. Fixes
		bug 1135, 'cm-segfault on decrypting
		with PGP/inline'

diff --git a/ChangeLog b/ChangeLog
index 88ced332db21664b8e6ceee8ac36eab3a999ef89..09042fba397003044e6c8390986411c18c3a1373 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-03 [colin]     2.8.0cvs11
+
+       * src/plugins/pgpinline/pgpinline.c
+               Fix off-by-one, fix double-free. Fixes
+               bug 1135, 'cm-segfault on decrypting 
+               with PGP/inline'
+
 2007-03-03 [colin]     2.8.0cvs10
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index 0d81b41064e98bc0c815d4e410336b5710768039..cb2ab547f207eba954a88b6b55d9a39dc1fefa50 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2403,3 +2403,4 @@
 ( cvs diff -u -r 1.274.2.175 -r 1.274.2.176 src/mainwindow.c;  cvs diff -u -r 1.2.2.17 -r 1.2.2.18 src/gtk/colorlabel.c;  ) > 2.8.0cvs8.patchset
 ( cvs diff -u -r 1.28.2.33 -r 1.28.2.34 src/mbox.c;  ) > 2.8.0cvs9.patchset
 ( cvs diff -u -r 1.654.2.2458 -r 1.654.2.2459 configure.ac;  cvs diff -u -r 1.115.2.140 -r 1.115.2.141 src/main.c;  cvs diff -u -r 1.13.2.26 -r 1.13.2.27 src/common/plugin.c;  ) > 2.8.0cvs10.patchset
+( cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/plugins/pgpinline/pgpinline.c;  ) > 2.8.0cvs11.patchset

diff --git a/configure.ac b/configure.ac
index dfc1cbd3a96bb28e4d6af86fdd76a37c432461e0..151b5775d73391d696df43417d946526202261f5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=10
+EXTRA_VERSION=11
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpinline/pgpinline.c b/src/plugins/pgpinline/pgpinline.c
index 3c171d770017e6842c8dce8d20ac6882710778bb..7492173ce185ed6c1c77308a7ab3bae1ece1db70 100644 (file)
--- a/src/plugins/pgpinline/pgpinline.c
+++ b/src/plugins/pgpinline/pgpinline.c
@@ -158,7 +158,7 @@ static gchar *get_part_as_string(MimeInfo *mimeinfo)
                }
        }
        if (textdata && mimeinfo->offset && 
-           mimeinfo->offset+ mimeinfo->length < strlen(textdata)) {
+           mimeinfo->offset+ mimeinfo->length <= strlen(textdata)) {
                real_data = g_strdup(textdata + mimeinfo->offset);
                real_data[mimeinfo->length] = '\0';
                g_free(textdata);
@@ -445,8 +445,6 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
 
        fclose(dstfp);
        
-       gpgme_data_release(plain);
-
        parseinfo = procmime_scan_file(fname);
        g_free(fname);