lib-smtp: smtp-server-command - Guarantee that non-destroy hooks aren't called for...

diff --git a/src/lib-smtp/smtp-server-command.c b/src/lib-smtp/smtp-server-command.c
index 1ae190e37352f48a76f1e10d2c64a73b490f2a29..c9b551b6ac687b8a37d1c9b72052e552f6389edf 100644 (file)
--- a/src/lib-smtp/smtp-server-command.c
+++ b/src/lib-smtp/smtp-server-command.c
@@ -394,8 +394,11 @@ bool smtp_server_command_call_hooks(struct smtp_server_command **_cmd,
        struct smtp_server_command *cmd = *_cmd;
        struct smtp_server_command_hook *hook;
 
-       if (type != SMTP_SERVER_COMMAND_HOOK_DESTROY)
+       if (type != SMTP_SERVER_COMMAND_HOOK_DESTROY) {
+               if (cmd->state >= SMTP_SERVER_COMMAND_STATE_FINISHED)
+                       return FALSE;
                smtp_server_command_ref(cmd);
+       }
 
        hook = cmd->hooks_head;
        while (hook != NULL) {