From 28dc72975e4b78ecf3c46bdf5d6aa44d62cf1ebd Mon Sep 17 00:00:00 2001 From: Markus Valentin Date: Mon, 22 Mar 2021 13:04:15 +0100 Subject: [PATCH] lib-compression: Get error with i_stream_get_error() so it's recursive In some cases the iostream.error was NULL so the errno default message was used. This fixes an regression introduced by 8b6142f9ba9. --- src/lib-compression/istream-decompress.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib-compression/istream-decompress.c b/src/lib-compression/istream-decompress.c index 1cd21e4562..77ddf9bfc8 100644 --- a/src/lib-compression/istream-decompress.c +++ b/src/lib-compression/istream-decompress.c @@ -17,9 +17,9 @@ static void copy_compressed_input_error(struct decompress_istream *zstream) stream->istream.stream_errno = zstream->compressed_input->stream_errno; stream->istream.eof = zstream->compressed_input->eof; - if (zstream->compressed_input->real_stream->iostream.error != NULL) { + if (zstream->compressed_input->stream_errno != 0) { io_stream_set_error(&stream->iostream, "%s", - zstream->compressed_input->real_stream->iostream.error); + i_stream_get_error(&zstream->compressed_input->real_stream->istream)); } } @@ -29,9 +29,9 @@ static void copy_decompressed_input_error(struct decompress_istream *zstream) stream->istream.stream_errno = zstream->decompressed_input->stream_errno; stream->istream.eof = zstream->decompressed_input->eof; - if (zstream->decompressed_input->real_stream->iostream.error != NULL) { + if (zstream->decompressed_input->stream_errno != 0) { io_stream_set_error(&stream->iostream, "%s", - zstream->decompressed_input->real_stream->iostream.error); + i_stream_get_error(&zstream->decompressed_input->real_stream->istream)); } } -- 2.47.3