lib: array_idx_modifiable changed not to allocate space.

dovecot · Dec 15, 2017 · 1d4e5de · 1d4e5de
1 parent 139143f
commit 1d4e5de
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/lib/array.c b/src/lib/array.c
@@ -4,7 +4,14 @@
 #include "array.h"
 
 
-void *array_idx_modifiable_i(struct array *array, unsigned int idx)
+void *
+array_idx_modifiable_i(const struct array *array, unsigned int idx)
+{
+	i_assert(idx * array->element_size < array->buffer->used);
+	return PTR_OFFSET(array->buffer->data, idx * array->element_size);
+}
+
+void *array_idx_get_space_i(struct array *array, unsigned int idx)
 {
 	return buffer_get_space_unsafe(array->buffer, idx * array->element_size,
 				       array->element_size);

diff --git a/src/lib/array.h b/src/lib/array.h
@@ -247,12 +247,16 @@ array_get_modifiable_i(struct array *array, unsigned int *count_r)
 	ARRAY_TYPE_CAST_MODIFIABLE(array) \
 		array_get_modifiable_i(&(array)->arr, count)
 
-void *array_idx_modifiable_i(struct array *array, unsigned int idx);
+void *
+array_idx_modifiable_i(const struct array *array, unsigned int idx) ATTR_PURE;
 #define array_idx_modifiable(array, idx) \
 	ARRAY_TYPE_CAST_MODIFIABLE(array) \
 		array_idx_modifiable_i(&(array)->arr, idx)
 
-#define array_idx_get_space(array, idx) array_idx_modifiable(array, idx)
+void *array_idx_get_space_i(struct array *array, unsigned int idx);
+#define array_idx_get_space(array, idx) \
+	ARRAY_TYPE_CAST_MODIFIABLE(array) \
+		array_idx_get_space_i(&(array)->arr, idx)
 
 void array_idx_set_i(struct array *array, unsigned int idx, const void *data);
 #define array_idx_set(array, idx, data) \