From: Eric Leblond <eric@regit.org>
Date: Fri, 18 Mar 2016 08:23:31 +0000 (+0100)
Subject: output-json-email: fix error code
X-Git-Tag: suricata-3.0.1RC1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92ad63abb78fc51b88d2c511f6c85a975509b8f9;p=thirdparty%2Fsuricata.git

output-json-email: fix error code

Returning early if first function call fail could avoid some issue.
---

diff --git a/src/output-json-email-common.c b/src/output-json-email-common.c
index f91f7f3073..b2750490d0 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);