From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 10 Jun 2020 12:53:41 +0000 (+0300)
Subject: fs-compress: Try all compression formats when decompressing
X-Git-Tag: 2.3.13~444
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0447775763c1e2737cc249cd1fbe28369e6b235a;p=thirdparty%2Fdovecot%2Fcore.git

fs-compress: Try all compression formats when decompressing

Not just the specified compression format.
---

diff --git a/src/plugins/fs-compress/fs-compress.c b/src/plugins/fs-compress/fs-compress.c
index 825db5e0f7..c99a31bd6b 100644
--- a/src/plugins/fs-compress/fs-compress.c
+++ b/src/plugins/fs-compress/fs-compress.c
@@ -162,21 +162,33 @@ fs_compress_try_create_stream(struct compress_fs_file *file,
 			      struct istream *plain_input)
 {
 	struct tee_istream *tee_input;
-	struct istream *child_input, *ret_input, *try_inputs[3];
-
-	if (!file->fs->try_plain)
-		return file->fs->compress_handler->create_istream(plain_input, FALSE);
+	struct istream *child_input, *ret_input, *input, **try_inputs;
+	ARRAY(struct istream *) try_inputs_arr;
+	unsigned int i, count;
 
 	tee_input = tee_i_stream_create(plain_input);
-	child_input = tee_i_stream_create_child(tee_input);
-	try_inputs[0] = file->fs->compress_handler->create_istream(child_input, FALSE);
-	try_inputs[1] = tee_i_stream_create_child(tee_input);
-	try_inputs[2] = NULL;
-	i_stream_unref(&child_input);
 
+	t_array_init(&try_inputs_arr, 10);
+	for (i = 0; compression_handlers[i].name != NULL; i++) {
+		if (compression_handlers[i].create_istream != NULL) {
+			child_input = tee_i_stream_create_child(tee_input);
+			input = compression_handlers[i].
+				create_istream(child_input, FALSE);
+			i_stream_unref(&child_input);
+			array_push_back(&try_inputs_arr, &input);
+		}
+	}
+	if (file->fs->try_plain) {
+		input = tee_i_stream_create_child(tee_input);
+		array_push_back(&try_inputs_arr, &input);
+	}
+	count = array_count(&try_inputs_arr);
+	array_append_zero(&try_inputs_arr);
+
+	try_inputs = array_idx_modifiable(&try_inputs_arr, 0);
 	ret_input = istream_try_create(try_inputs);
-	i_stream_unref(&try_inputs[0]);
-	i_stream_unref(&try_inputs[1]);
+	for (i = 0; i < count; i++)
+		i_stream_unref(&try_inputs[i]);
 	return ret_input;
 }