lib-smtp: server: command: Prevent reference counting from within destroy hook.

diff --git a/src/lib-smtp/smtp-server-command.c b/src/lib-smtp/smtp-server-command.c
index 1c0e526e463458c363ba7885bc2d9c44b602df05..c673ebc245e75a09a59e036881b8e8bf8eaf2d65 100644 (file)
--- a/src/lib-smtp/smtp-server-command.c
+++ b/src/lib-smtp/smtp-server-command.c
@@ -243,6 +243,8 @@ smtp_server_command_new(struct smtp_server_connection *conn,
 
 void smtp_server_command_ref(struct smtp_server_command *cmd)
 {
+       if (cmd->destroying)
+               return;
        cmd->refcount++;
 }
 
@@ -253,9 +255,13 @@ bool smtp_server_command_unref(struct smtp_server_command **_cmd)
 
        *_cmd = NULL;
 
+       if (cmd->destroying)
+               return FALSE;
+
        i_assert(cmd->refcount > 0);
        if (--cmd->refcount > 0)
                return TRUE;
+       cmd->destroying = TRUE;
 
        smtp_server_command_debug(&cmd->context, "Destroy");
 

diff --git a/src/lib-smtp/smtp-server-private.h b/src/lib-smtp/smtp-server-private.h
index 3b0c397241fd153a694963db12337e49b2955b72..9d9365880b420a0bef50d569e9ad92b5c5d559c6 100644 (file)
--- a/src/lib-smtp/smtp-server-private.h
+++ b/src/lib-smtp/smtp-server-private.h
@@ -108,6 +108,7 @@ struct smtp_server_command {
        bool input_locked:1;
        bool input_captured:1;
        bool reply_early:1;
+       bool destroying:1;
 };
 
 struct smtp_server_recipient_private {