From 34069054ce53adab5dc32747c31fb0a9e57682ca Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Thu, 10 Apr 2014 09:40:42 +0200
Subject: [PATCH] drop-json: fix cleanup

Use proper function for sub-module cleanup. LogFileCtx is not managed
by the sub-module, so don't clean it.
---
 src/output-json-drop.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/output-json-drop.c b/src/output-json-drop.c
index a9cb069e13..6be56f3e6b 100644
--- a/src/output-json-drop.c
+++ b/src/output-json-drop.c
@@ -193,6 +193,14 @@ static void JsonDropLogDeInitCtx(OutputCtx *output_ctx)
     SCFree(output_ctx);
 }
 
+static void JsonDropLogDeInitCtxSub(OutputCtx *output_ctx)
+{
+    OutputDropLoggerDisable();
+
+    SCLogDebug("cleaning up sub output_ctx %p", output_ctx);
+    SCFree(output_ctx);
+}
+
 #define DEFAULT_LOG_FILENAME "drop.json"
 static OutputCtx *JsonDropLogInitCtx(ConfNode *conf)
 {
@@ -238,7 +246,7 @@ static OutputCtx *JsonDropLogInitCtxSub(ConfNode *conf, OutputCtx *parent_ctx)
     }
 
     output_ctx->data = ajt->file_ctx;
-    output_ctx->DeInit = JsonDropLogDeInitCtx;
+    output_ctx->DeInit = JsonDropLogDeInitCtxSub;
     return output_ctx;
 }