lib-compression: istream-zstd - Fix infinite loop when istream is non…

…blocking
dovecot · Jun 9, 2020 · 0fb7f89 · 0fb7f89
1 parent 87f109d
commit 0fb7f89
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/lib-compression/istream-zstd.c b/src/lib-compression/istream-zstd.c
@@ -138,13 +138,16 @@ static ssize_t i_stream_zstd_read(struct istream_private *stream)
 					stream->istream.stream_errno = EPIPE;
 				return ret;
 			}
+			if (ret == 0)
+				return 0;
 			buffer_append(zstream->frame_buffer, data, size);
 			i_stream_skip(stream->parent, size);
 			zstream->input.src = zstream->frame_buffer->data;
 			zstream->input.size = zstream->frame_buffer->used;
 			zstream->input.pos = 0;
 		}
 
+		i_assert(zstream->input.size > 0);
 		i_assert(zstream->data_buffer->used == 0);
 		zstream->output.dst = buffer_append_space_unsafe(zstream->data_buffer,
 								 ZSTD_DStreamOutSize());