From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Mon, 2 Sep 2019 19:56:37 +0000 (+0200)
Subject: lib: istream-base64-encoder - Use i_stream_try_alloc() properly.
X-Git-Tag: 2.3.8~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=befb7065b7c85c16a8597f9d16d8c98184023c33;p=thirdparty%2Fdovecot%2Fcore.git

lib: istream-base64-encoder - Use i_stream_try_alloc() properly.
---

diff --git a/src/lib/istream-base64-encoder.c b/src/lib/istream-base64-encoder.c
index b20df93dd4..6cda4d6aa6 100644
--- a/src/lib/istream-base64-encoder.c
+++ b/src/lib/istream-base64-encoder.c
@@ -39,7 +39,7 @@ i_stream_base64_try_encode(struct base64_encoder_istream *bstream)
 	struct istream_private *stream = &bstream->istream;
 	struct base64_encoder *b64enc = &bstream->encoder;
 	const unsigned char *data;
-	size_t size, pos, out_size, buffer_avail;
+	size_t size, pos, out_size, avail;
 	buffer_t buf;
 
 	data = i_stream_get_data(stream->parent, &size);
@@ -47,12 +47,10 @@ i_stream_base64_try_encode(struct base64_encoder_istream *bstream)
 		return 0;
 
 	out_size = base64_encode_get_size(b64enc, size);
-	i_stream_try_alloc(stream, out_size, &buffer_avail);
-	if (buffer_avail == 0)
+	if (!i_stream_try_alloc(stream, out_size, &avail))
 		return -2;
 
-	buffer_create_from_data(&buf, stream->w_buffer + stream->pos,
-				buffer_avail);
+	buffer_create_from_data(&buf, stream->w_buffer + stream->pos, avail);
 	base64_encode_more(b64enc, data, size, &pos, &buf);
 	i_assert(buf.used > 0);