[dovecot-cvs] dovecot/src/lib-index mail-index-sync-update.c, 1.68, 1.69

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-index
In directory talvi:/tmp/cvs-serv18866/lib-index

Modified Files:
	mail-index-sync-update.c 
Log Message:
broken fix for sync handler deinitializing..



Index: mail-index-sync-update.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-index/mail-index-sync-update.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- mail-index-sync-update.c	30 Nov 2004 09:20:25 -0000	1.68
+++ mail-index-sync-update.c	30 Nov 2004 09:37:33 -0000	1.69
@@ -122,18 +122,20 @@
 {
 	const struct mail_index_sync_handler *sync_handlers;
 	const struct mail_index_ext *ext;
-	size_t i, size;
+	size_t i, synch_size, size;
 
 	if (ctx->extra_context == NULL)
 		return;
 
-	sync_handlers = buffer_get_data(ctx->view->index->sync_handlers, &size);
-	size /= sizeof(*sync_handlers);
+	sync_handlers = buffer_get_data(ctx->view->index->sync_handlers,
+					&synch_size);
+	synch_size /= sizeof(*sync_handlers);
 
-	i_assert(size <= ctx->extra_context_buf->used / sizeof(void *));
+	i_assert(synch_size <= ctx->extra_context_buf->used / sizeof(void *));
 
-	ext = ctx->view->map->extensions->data;
-	i_assert(ctx->view->map->extensions->used / sizeof(*ext) == size);
+	ext = buffer_get_data(ctx->view->map->extensions, &size);
+	size /= sizeof(*ext);
+	i_assert(size <= synch_size);
 
 	/* sync_handlers[] is ordered by index->extensions while
 	   extra_context is ordered by map->extensions. */