From: Paul Howarth <paul@city-fan.org>
Date: Mon, 2 Jul 2018 10:52:14 +0000 (+0100)
Subject: lib-compression: Fix assert-crash in test suite on 32bit systems
X-Git-Tag: 2.3.3.rc1~242
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64f4464385bbcd763f90abc5e212c569b9279ffa;p=thirdparty%2Fdovecot%2Fcore.git

lib-compression: Fix assert-crash in test suite on 32bit systems

Fix compilation warnings in test-compression.c due to mismatches
between size_t and uoff_t, which then manifests in assert-crashes
running the test suite on 32bit systems.
---

diff --git a/src/lib-compression/test-compression.c b/src/lib-compression/test-compression.c
index 0f7df3d1fe..f62d7d6094 100644
--- a/src/lib-compression/test-compression.c
+++ b/src/lib-compression/test-compression.c
@@ -20,6 +20,7 @@ static void test_compression_handler(const struct compression_handler *handler)
 	unsigned char buf[IO_BLOCK_SIZE];
 	const unsigned char *data;
 	size_t size;
+	uoff_t stream_size;
 	struct sha1_ctxt sha1;
 	unsigned char output_sha1[SHA1_RESULTLEN], input_sha1[SHA1_RESULTLEN];
 	unsigned int i;
@@ -73,11 +74,11 @@ static void test_compression_handler(const struct compression_handler *handler)
 	file_input = i_stream_create_fd(fd, IO_BLOCK_SIZE);
 	input = handler->create_istream(file_input, FALSE);
 
-	test_assert(i_stream_get_size(input, FALSE, &size) == 1);
-	test_assert(size == compressed_size);
+	test_assert(i_stream_get_size(input, FALSE, &stream_size) == 1);
+	test_assert(stream_size == compressed_size);
 
-	test_assert(i_stream_get_size(input, TRUE, &size) == 1);
-	test_assert(size == uncompressed_size);
+	test_assert(i_stream_get_size(input, TRUE, &stream_size) == 1);
+	test_assert(stream_size == uncompressed_size);
 
 	sha1_init(&sha1);
 	for (bool seeked = FALSE;;) {