From 8c8d530a17e4b37e5fc9a5dfdd532bbb9811f895 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Mon, 12 Mar 2018 14:48:41 +0200 Subject: [PATCH] lib-dcrypt: istream-decrypt - Read more if buffer is empty If there is no more buffered data, try to decrypt more. - Fixes Panic: file istream.c: line 192 (i_stream_read): assertion failed: (!stream->blocking) - Fixes infinite loop when stream is not blocking --- src/lib-dcrypt/istream-decrypt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib-dcrypt/istream-decrypt.c b/src/lib-dcrypt/istream-decrypt.c index d9f27e0d55..4b0854dcb0 100644 --- a/src/lib-dcrypt/istream-decrypt.c +++ b/src/lib-dcrypt/istream-decrypt.c @@ -673,7 +673,8 @@ i_stream_decrypt_read(struct istream_private *stream) bytes = new_pos - stream->pos; stream->pos = new_pos; - return (ssize_t)bytes; + if (bytes > 0) + return (ssize_t)bytes; } if (dstream->finalized) { /* all data decrypted */ -- 2.47.3