lib-storage: Fixed assert-crash in user deinit with some installations.

diff --git a/src/lib-storage/mail-user.c b/src/lib-storage/mail-user.c
index df61c8a7a327861f60f4a1867e70c2516586d80c..860cb1ef77ef0e155ee81694ab10392d16487976 100644 (file)
--- a/src/lib-storage/mail-user.c
+++ b/src/lib-storage/mail-user.c
@@ -26,7 +26,6 @@ struct auth_master_connection *mail_user_auth_master_conn;
 static void mail_user_deinit_base(struct mail_user *user)
 {
        mail_namespaces_deinit(&user->namespaces);
-       pool_unref(&user->pool);
 }
 
 struct mail_user *mail_user_alloc(const char *username,
@@ -137,8 +136,16 @@ void mail_user_unref(struct mail_user **_user)
        i_assert(user->refcount > 0);
 
        *_user = NULL;
-       if (--user->refcount == 0)
-               user->v.deinit(user);
+       if (user->refcount > 1) {
+               user->refcount--;
+               return;
+       }
+
+       /* call deinit() with refcount=1, otherwise we may assert-crash in
+          mail_user_ref() that is called by some deinit() handler. */
+       user->v.deinit(user);
+       i_assert(user->refcount == 1);
+       pool_unref(&user->pool);
 }
 
 struct mail_user *mail_user_find(struct mail_user *user, const char *name)