dovecot-2.1: lib-master: Settings cache crashed after config_cac...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/2815175a0ffc
changeset: 14658:2815175a0ffc
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Aug 07 17:56:24 2012 +0300
description:
lib-master: Settings cache crashed after config_cache_size was reached.
This affected login processes when local {} and/or remote {} blocks were
specified. Also fixed the cache behavior to be MRU.

diffstat:

 src/lib-master/master-service-settings-cache.c |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (51 lines):

diff -r ab6a4455b27d -r 2815175a0ffc src/lib-master/master-service-settings-cache.c
--- a/src/lib-master/master-service-settings-cache.c	Fri Aug 03 17:39:54 2012 +0300
+++ b/src/lib-master/master-service-settings-cache.c	Tue Aug 07 17:56:24 2012 +0300
@@ -145,6 +145,8 @@
 	}
 
 	if (entry != NULL) {
+		DLLIST2_REMOVE(&cache->oldest, &cache->newest, entry);
+		DLLIST2_APPEND(&cache->oldest, &cache->newest, entry);
 		*parser_r = entry->parser;
 		return TRUE;
 	}
@@ -195,31 +197,29 @@
 		/* use global settings, but add local_ip/host to hash tables
 		   so we'll find them */
 		pool = pool_alloconly_create("settings global entry", 256);
-		entry = p_new(pool, struct settings_entry, 1);
 	} else if (cache->cache_malloc_size >= cache->max_cache_size) {
 		/* free the oldest and reuse its pool */
-		entry = cache->oldest;
-		pool = entry->pool;
-		setting_entry_detach(cache, entry);
-		p_clear(pool);
+		pool = cache->oldest->pool;
+		setting_entry_detach(cache, cache->oldest);
+		p_clear(pool); /* note: frees also entry */
 	} else {
 		pool_size = cache->approx_entry_pool_size != 0 ?
 			cache->approx_entry_pool_size :
 			CACHE_INITIAL_ENTRY_POOL_SIZE;
 		pool = pool_alloconly_create("settings entry", pool_size);
-		entry = p_new(pool, struct settings_entry, 1);
 	}
+	entry = p_new(pool, struct settings_entry, 1);
 	entry->pool = pool;
 	entry_local_name = p_strdup(pool, input->local_name);
 	entry->local_name = entry_local_name;
 	entry->local_ip = input->local_ip;
 	if (!output->used_local) {
 		entry->parser = cache->global_parser;
-		DLLIST2_PREPEND(&cache->oldest_global, &cache->newest_global,
-				entry);
+		DLLIST2_APPEND(&cache->oldest_global, &cache->newest_global,
+			       entry);
 	} else {
 		entry->parser = settings_parser_dup(parser, entry->pool);
-		DLLIST2_PREPEND(&cache->oldest, &cache->newest, entry);
+		DLLIST2_APPEND(&cache->oldest, &cache->newest, entry);
 
 		pool_size = pool_alloconly_get_total_used_size(pool);
 		if (pool_size > cache->approx_entry_pool_size) {