]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
output-json-email: fix error code
authorEric Leblond <eric@regit.org>
Fri, 18 Mar 2016 08:23:31 +0000 (09:23 +0100)
committerVictor Julien <victor@inliniac.net>
Mon, 21 Mar 2016 15:01:27 +0000 (16:01 +0100)
Returning early if first function call fail could avoid some issue.

src/output-json-email-common.c

index f91f7f3073880979c858080b94576c5c5a7c6eb3..b2750490d098dbd997af63c4e9619f0bfda7d483 100644 (file)
@@ -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);