aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-04-24 10:54:12 +0200
committerJohannes Berg <johannes@sipsolutions.net>2008-04-24 10:54:12 +0200
commit938d7cf7209014f0b219a58c0c6cc6bc5f7cce4c (patch)
treeb14f1ca956fe4fa8c5088801390b49978d0ee97b
parentea5d54cbd201063db87015a3035748ff678562b1 (diff)
downloaddovecot-antispam-938d7cf7209014f0b219a58c0c6cc6bc5f7cce4c.tar.gz
dovecot-antispam-938d7cf7209014f0b219a58c0c6cc6bc5f7cce4c.tar.xz
dovecot-antispam-938d7cf7209014f0b219a58c0c6cc6bc5f7cce4c.zip
mailtrain: fix bug with stripping "From " line
-rw-r--r--mailtrain.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/mailtrain.c b/mailtrain.c
index dbe770c..75c0fc8 100644
--- a/mailtrain.c
+++ b/mailtrain.c
@@ -213,7 +213,9 @@ int backend_handle_mail(struct mailbox_transaction_context *t,
struct istream *mailstream;
struct ostream *outstream;
int ret;
- char *buf, *firstline;
+ char *buf;
+ const unsigned char *beginning;
+ size_t size;
int fd;
if (!ast->tmpdir) {
@@ -266,15 +268,25 @@ int backend_handle_mail(struct mailbox_transaction_context *t,
goto failed_to_copy;
}
- firstline = i_stream_read_next_line(mailstream);
+ if (i_stream_read_data(mailstream, &beginning, &size, 5) < 0 ||
+ size < 5) {
+ ret = -1;
+ mail_storage_set_error(t->box->storage,
+ "Failed to read mail beginning");
+ goto failed_to_copy;
+ }
- if (strncmp(firstline, "From ", 5) != 0)
- if (o_stream_send_str(outstream, firstline) < 0) {
+ /* "From "? skip line */
+ if (memcmp("From ", beginning, 5) == 0) {
+ i_stream_read_next_line(mailstream);
+ } else {
+ if (o_stream_send_str(outstream, "From ") < 0) {
ret = -1;
mail_storage_set_error(t->box->storage,
"Failed to write line to temp");
goto failed_to_copy;
}
+ }
if (o_stream_send_istream(outstream, mailstream) < 0) {
ret = -1;