lib-smtp: smtp-server-cmd-helo - Fix panic occurring for default HELO reply.

This only fails for the HELO command; the EHLO command is unaffected. The
default reply routine is not actually used at the moment, but it is used by the
fuzzer.

Panic was:

Panic: file smtp-server-cmd-helo.c: line 160 (smtp_server_cmd_ehlo_reply_create): assertion failed: (cmd->cmd->reg->func == smtp_server_cmd_ehlo)

diff --git a/src/lib-smtp/smtp-server-cmd-helo.c b/src/lib-smtp/smtp-server-cmd-helo.c
index 54b344bb07a795c84f9a598eedb6f39f981a17b5..a9666e40026bbca79335d10730fd6c401fb49f6a 100644 (file)
--- a/src/lib-smtp/smtp-server-cmd-helo.c
+++ b/src/lib-smtp/smtp-server-cmd-helo.c
@@ -157,11 +157,13 @@ smtp_server_cmd_ehlo_reply_create(struct smtp_server_cmd_ctx *cmd)
        unsigned int extra_caps_count, i, j;
        struct smtp_server_reply *reply;
 
-       i_assert(cmd->cmd->reg->func == smtp_server_cmd_ehlo);
        reply = smtp_server_reply_create_ehlo(cmd->cmd);
 
-       if (helo_data->helo.old_smtp)
+       if (helo_data->helo.old_smtp) {
+               i_assert(cmd->cmd->reg->func == smtp_server_cmd_helo);
                return reply;
+       }
+       i_assert(cmd->cmd->reg->func == smtp_server_cmd_ehlo);
 
        extra_caps_count = 0;
        if (array_is_created(&conn->extra_capabilities)) {