Mercurial > dovecot > core-2.2
changeset 12418:3f19e7e43506
istream-base64-encoder: Don't add unwanted trailing [CR]LF
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Mon, 15 Nov 2010 16:06:58 +0000 |
| parents | 967de059f94d |
| children | b1d946388d9b |
| files | src/lib/istream-base64-encoder.c |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib/istream-base64-encoder.c Mon Nov 15 15:42:21 2010 +0000 +++ b/src/lib/istream-base64-encoder.c Mon Nov 15 16:06:58 2010 +0000 @@ -46,6 +46,10 @@ 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 @@ 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;