i_stream_read_data() could have returned invalid data at EOF (notable with

mboxes since end of mail = "EOF").

--HG--
branch : HEAD

diff --git a/src/lib/istream.c b/src/lib/istream.c
index 0d842465209b29d46a2617e0ea0dd9215c71a324..7e1fe0b6c26aaaabfcdc85f5c6706eb985d31477 100644 (file)
--- a/src/lib/istream.c
+++ b/src/lib/istream.c
@@ -190,6 +190,7 @@ int i_stream_read_data(struct istream *stream, const unsigned char **data,
                ret = i_stream_read(stream);
        } while (ret >= 0);
 
+       *data = i_stream_get_data(stream, size);
        return ret == -2 ? -2 :
                *size > 0 ? 0 : -1;
 }