From: Timo Sirainen <tss@iki.fi>
Date: Mon, 7 Jun 2010 18:28:15 +0000 (+0100)
Subject: auth: Another attempt in trying to fix crashed at deinit on pending async auth reques... 
X-Git-Tag: 2.0.beta6~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c6c6b95f482d2a2cdc74db5582aeb24871e3579;p=thirdparty%2Fdovecot%2Fcore.git

auth: Another attempt in trying to fix crashed at deinit on pending async auth request lookups.

--HG--
branch : HEAD
---

diff --git a/src/auth/auth-request-handler.c b/src/auth/auth-request-handler.c
index 13d8b884ae..097ef69ef2 100644
--- a/src/auth/auth-request-handler.c
+++ b/src/auth/auth-request-handler.c
@@ -62,14 +62,25 @@ auth_request_handler_create(auth_request_callback_t *callback, void *context,
 static void auth_request_handler_unref(struct auth_request_handler **_handler)
 {
         struct auth_request_handler *handler = *_handler;
-	struct hash_iterate_context *iter;
-	void *key, *value;
 
 	*_handler = NULL;
 	i_assert(handler->refcount > 0);
 	if (--handler->refcount > 0)
 		return;
 
+	/* notify parent that we're done with all requests */
+	handler->callback(NULL, handler->context);
+
+	hash_table_destroy(&handler->requests);
+	pool_unref(&handler->pool);
+}
+
+static void
+auth_request_handler_destroy_requests(struct auth_request_handler *handler)
+{
+	struct hash_iterate_context *iter;
+	void *key, *value;
+
 	iter = hash_table_iterate_init(handler->requests);
 	while (hash_table_iterate(iter, &key, &value)) {
 		struct auth_request *auth_request = value;
@@ -78,12 +89,7 @@ static void auth_request_handler_unref(struct auth_request_handler **_handler)
 		auth_request_unref(&auth_request);
 	}
 	hash_table_iterate_deinit(&iter);
-
-	/* notify parent that we're done with all requests */
-	handler->callback(NULL, handler->context);
-
-	hash_table_destroy(&handler->requests);
-	pool_unref(&handler->pool);
+	hash_table_clear(handler->requests, TRUE);
 }
 
 void auth_request_handler_destroy(struct auth_request_handler **_handler)
@@ -95,6 +101,7 @@ void auth_request_handler_destroy(struct auth_request_handler **_handler)
 	i_assert(!handler->destroyed);
 
 	handler->destroyed = TRUE;
+	auth_request_handler_destroy_requests(handler);
 	auth_request_handler_unref(&handler);
 }