* src/plugins/pgpinline/pgpinline.c
Fix bug 1110, 'pgpmime fails to process
encapsulated openpgp mime (rfc 3156, 6.1
-> rfc1847)'
It was due to an interaction between PGP/Mime
and PGP/Inline plugin.
+2007-02-08 [colin] 2.7.2cvs33
+
+ * src/plugins/pgpinline/pgpinline.c
+ Fix bug 1110, 'pgpmime fails to process
+ encapsulated openpgp mime (rfc 3156, 6.1
+ -> rfc1847)'
+ It was due to an interaction between PGP/Mime
+ and PGP/Inline plugin.
+
2007-02-08 [colin] 2.7.2cvs32
* src/inc.c
( cvs diff -u -r 1.3.2.15 -r 1.3.2.16 src/ldapquery.c; ) > 2.7.2cvs30.patchset
( cvs diff -u -r 1.105.2.84 -r 1.105.2.85 src/prefs_account.c; ) > 2.7.2cvs31.patchset
( cvs diff -u -r 1.149.2.64 -r 1.149.2.65 src/inc.c; cvs diff -u -r 1.28.2.32 -r 1.28.2.33 src/mbox.c; cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/mbox.h; ) > 2.7.2cvs32.patchset
+( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/plugins/pgpinline/pgpinline.c; ) > 2.7.2cvs33.patchset
MICRO_VERSION=2
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=33
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
static gchar *get_part_as_string(MimeInfo *mimeinfo)
{
gchar *textdata = NULL;
-
+ gchar *real_data = NULL;
g_return_val_if_fail(mimeinfo != NULL, 0);
procmime_decode_content(mimeinfo);
if (mimeinfo->content == MIMECONTENT_MEM)
textdata = tmp;
}
}
-
+ if (textdata && mimeinfo->offset &&
+ mimeinfo->offset+ mimeinfo->length < strlen(textdata)) {
+ real_data = g_strdup(textdata + mimeinfo->offset);
+ real_data[mimeinfo->length] = '\0';
+ g_free(textdata);
+ textdata = real_data;
+ } else if (textdata && mimeinfo->offset) {
+ debug_print("got data shorter than what it should be\n");
+ }
return textdata;
}
}
g_free(textdata);
+
return TRUE;
}