From 92ad63abb78fc51b88d2c511f6c85a975509b8f9 Mon Sep 17 00:00:00 2001 From: Eric Leblond Date: Fri, 18 Mar 2016 09:23:31 +0100 Subject: [PATCH] output-json-email: fix error code Returning early if first function call fail could avoid some issue. --- src/output-json-email-common.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/output-json-email-common.c b/src/output-json-email-common.c index f91f7f307388..b2750490d098 100644 --- a/src/output-json-email-common.c +++ b/src/output-json-email-common.c @@ -371,6 +371,10 @@ TmEcode JsonEmailLogJson(JsonEmailLogThread *aft, json_t *js, const Packet *p, F OutputJsonEmailCtx *email_ctx = aft->emaillog_ctx; SMTPTransaction *tx = (SMTPTransaction *) vtx; + if (sjs == NULL) { + SCReturnInt(TM_ECODE_FAILED); + } + if ((email_ctx->flags & LOG_EMAIL_EXTENDED) || (email_ctx->fields != 0)) JsonEmailLogJSONCustom(email_ctx, sjs, tx);