aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/camel-mime-filter-canon.c12
2 files changed, 9 insertions, 9 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 28d899fbf0..b636210fb2 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-19 Not Zed <NotZed@Ximian.com>
+
+ * camel-mime-filter-canon.c (filter): only copy 5 chars after the
+ F if we actually have "From ", otherwise we might have F.{,4}\n
+ instead and break eol canonicalisation. For #53355.
+
2004-07-16 Not Zed <NotZed@Ximian.com>
* camel-gpg-context.c: Added some debug stuff.
diff --git a/camel/camel-mime-filter-canon.c b/camel/camel-mime-filter-canon.c
index 43337ae856..557ddd943c 100644
--- a/camel/camel-mime-filter-canon.c
+++ b/camel/camel-mime-filter-canon.c
@@ -103,18 +103,12 @@ filter(CamelMimeFilter *f, char *in, size_t len, size_t prespace, char **out, si
inptr++;
if (inptr < inend-4) {
if (strncmp(inptr, "rom ", 4) == 0) {
- *o++ = '=';
- *o++ = '4';
- *o++ = '6';
+ strcpy(o, "=46rom ");
+ o+= 7;
} else
*o++ = 'F';
- *o++ = *inptr++;
- *o++ = *inptr++;
- *o++ = *inptr++;
- *o++ = *inptr++;
- } else {
+ } else
break;
- }
}
/* now scan for end of line */