From: Jason Ish <jason.ish@oisf.net>
Date: Mon, 29 Jun 2020 17:11:36 +0000 (-0600)
Subject: dhcp/eve: remove erroneous jsonbuilder close
X-Git-Tag: suricata-6.0.0-beta1~293
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=114b7e5cd98397f81c6335984c290fdac93f98f0;p=thirdparty%2Fsuricata.git

dhcp/eve: remove erroneous jsonbuilder close

The JsonBuilder was being closed to early.
---

diff --git a/src/output-json-dhcp.c b/src/output-json-dhcp.c
index ecdd9d237c..73a3d2303f 100644
--- a/src/output-json-dhcp.c
+++ b/src/output-json-dhcp.c
@@ -77,9 +77,6 @@ static int JsonDHCPLogger(ThreadVars *tv, void *thread_data,
     EveAddCommonOptions(&thread->dhcplog_ctx->cfg, p, f, js);
 
     rs_dhcp_logger_log(ctx->rs_logger, tx, js);
-    if (!jb_close(js)) {
-        goto fail;
-    }
 
     EveAddCommonOptions(&thread->dhcplog_ctx->cfg, p, f, js);
     MemBufferReset(thread->buffer);
@@ -87,10 +84,6 @@ static int JsonDHCPLogger(ThreadVars *tv, void *thread_data,
     jb_free(js);
 
     return TM_ECODE_OK;
-
-fail:
-    jb_free(js);
-    return TM_ECODE_FAILED;
 }
 
 static void OutputDHCPLogDeInitCtxSub(OutputCtx *output_ctx)