From: Victor Julien <victor@inliniac.net>
Date: Thu, 10 Apr 2014 06:24:08 +0000 (+0200)
Subject: alert-json: fix cleanup
X-Git-Tag: suricata-2.0.1rc1~64
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f2310bb342c5f1a6f28ecaca18ebf9707fc6c15;p=thirdparty%2Fsuricata.git

alert-json: fix cleanup

Call specialized clean up function when running as a sub-module.
---

diff --git a/src/output-json-alert.c b/src/output-json-alert.c
index 55c51dd7d4..60d2f7bc10 100644
--- a/src/output-json-alert.c
+++ b/src/output-json-alert.c
@@ -260,11 +260,18 @@ static TmEcode JsonAlertLogThreadDeinit(ThreadVars *t, void *data)
 
 static void JsonAlertLogDeInitCtx(OutputCtx *output_ctx)
 {
+    SCLogDebug("cleaning up output_ctx");
     LogFileCtx *logfile_ctx = (LogFileCtx *)output_ctx->data;
     LogFileFreeCtx(logfile_ctx);
     SCFree(output_ctx);
 }
 
+static void JsonAlertLogDeInitCtxSub(OutputCtx *output_ctx)
+{
+    SCLogDebug("cleaning up sub output_ctx %p", output_ctx);
+    SCFree(output_ctx);
+}
+
 #define DEFAULT_LOG_FILENAME "alert.json"
 /**
  * \brief Create a new LogFileCtx for "fast" output style.
@@ -307,7 +314,7 @@ static OutputCtx *JsonAlertLogInitCtxSub(ConfNode *conf, OutputCtx *parent_ctx)
         return NULL;
 
     output_ctx->data = ajt->file_ctx;
-    output_ctx->DeInit = JsonAlertLogDeInitCtx;
+    output_ctx->DeInit = JsonAlertLogDeInitCtxSub;
 
     return output_ctx;
 }