istream-base64-encoder: Don't add unwanted trailing [CR]LF

diff --git a/src/lib/istream-base64-encoder.c b/src/lib/istream-base64-encoder.c
index 2f5b1709e8421b95acbb2022761309124874765c..21ec7053408f80c59e4d2a2a14f9d023f51c8600 100644 (file)
--- a/src/lib/istream-base64-encoder.c
+++ b/src/lib/istream-base64-encoder.c
@@ -46,6 +46,10 @@ i_stream_base64_try_encode_line(struct base64_encoder_istream *bstream)
        size_t size, buffer_avail;
        buffer_t buf;
 
+       data = i_stream_get_data(stream->parent, &size);
+       if (size == 0)
+               return FALSE;
+
        if (bstream->cur_line_len == bstream->chars_per_line) {
                /* @UNSAFE: end of line, add newline */
                if (!i_stream_get_buffer_space(stream,
@@ -57,9 +61,6 @@ i_stream_base64_try_encode_line(struct base64_encoder_istream *bstream)
                stream->w_buffer[stream->pos++] = '\n';
                bstream->cur_line_len = 0;
        }
-       data = i_stream_get_data(stream->parent, &size);
-       if (size == 0)
-               return FALSE;
 
        i_stream_get_buffer_space(stream, (size+2)/3*4, NULL);
        buffer_avail = stream->buffer_size - stream->pos;