From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Fri, 4 Jan 2019 14:01:01 +0000 (+0200)
Subject: lib: array - Fix asserts to work correctly on 32-bit systems
X-Git-Tag: 2.3.9~966
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99cede4ba0a184e349cea1bb41b057e15b0495e8;p=thirdparty%2Fdovecot%2Fcore.git

lib: array - Fix asserts to work correctly on 32-bit systems
---

diff --git a/src/lib/array.c b/src/lib/array.c
index 5817e423d4..21578f7e33 100644
--- a/src/lib/array.c
+++ b/src/lib/array.c
@@ -7,7 +7,7 @@
 void *
 array_idx_modifiable_i(const struct array *array, unsigned int idx)
 {
-	i_assert(idx * array->element_size < array->buffer->used);
+	i_assert(idx < array->buffer->used / array->element_size);
 	return PTR_OFFSET(array->buffer->data, idx * array->element_size);
 }
 
diff --git a/src/lib/array.h b/src/lib/array.h
index ca37fcfbf4..70c19c8975 100644
--- a/src/lib/array.h
+++ b/src/lib/array.h
@@ -239,7 +239,7 @@ array_get_i(const struct array *array, unsigned int *count_r)
 static inline const void * ATTR_PURE
 array_idx_i(const struct array *array, unsigned int idx)
 {
-	i_assert(idx * array->element_size < array->buffer->used);
+	i_assert(idx < array->buffer->used / array->element_size);
 	return CONST_PTR_OFFSET(array->buffer->data, idx * array->element_size);
 }
 #define array_idx(array, idx) \
diff --git a/src/lib/test-array.c b/src/lib/test-array.c
index 8fde0ee3ae..4f92f1f98d 100644
--- a/src/lib/test-array.c
+++ b/src/lib/test-array.c
@@ -334,7 +334,7 @@ enum fatal_test_state fatal_array(unsigned int stage)
 		test_begin("fatal_array");
 		t_array_init(&ad, 3);
 		/* allocation big enough, but memory not initialised */
-		test_expect_fatal_string("(array_idx_i): assertion failed: (idx * array->element_size < array->buffer->used)");
+		test_expect_fatal_string("(array_idx_i): assertion failed: (idx < array->buffer->used / array->element_size)");
 		useless_ptr = array_idx(&ad, 0);
 		return FATAL_TEST_FAILURE;
 	}
@@ -344,7 +344,7 @@ enum fatal_test_state fatal_array(unsigned int stage)
 		t_array_init(&ad, 2);
 		array_append(&ad, tmpd, 2);
 		/* actual out of range address requested */
-		test_expect_fatal_string("(array_idx_i): assertion failed: (idx * array->element_size < array->buffer->used)");
+		test_expect_fatal_string("(array_idx_i): assertion failed: (idx < array->buffer->used / array->element_size)");
 		useless_ptr = array_idx(&ad, 2);
 		return FATAL_TEST_FAILURE;
 	}