]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
lua-output: don't crash on script setup error
authorVictor Julien <victor@inliniac.net>
Tue, 5 Jul 2016 14:00:31 +0000 (16:00 +0200)
committerVictor Julien <victor@inliniac.net>
Tue, 5 Jul 2016 14:00:31 +0000 (16:00 +0200)
src/output-lua.c

index c2aadbbbdf8c591d951c9bcabf31ab26d7b5c3f3..eb32911337f285b38edecf9348014ae14c94c082 100644 (file)
@@ -816,12 +816,12 @@ static OutputCtx *OutputLuaLogInit(ConfNode *conf)
     if (unlikely(output_ctx == NULL)) {
         return NULL;
     }
+    output_ctx->DeInit = LogLuaMasterFree;
     output_ctx->data = SCCalloc(1, sizeof(LogLuaMasterCtx));
     if (unlikely(output_ctx->data == NULL)) {
         SCFree(output_ctx);
         return NULL;
     }
-    output_ctx->DeInit = LogLuaMasterFree;
     LogLuaMasterCtx *master_config = output_ctx->data;
     strlcpy(master_config->path, dir, sizeof(master_config->path));
     TAILQ_INIT(&output_ctx->submodules);
@@ -904,9 +904,8 @@ static OutputCtx *OutputLuaLogInit(ConfNode *conf)
     return output_ctx;
 
 error:
-    if (output_ctx->DeInit && output_ctx->data)
-        output_ctx->DeInit(output_ctx->data);
-    SCFree(output_ctx);
+    if (output_ctx->DeInit)
+        output_ctx->DeInit(output_ctx);
     return NULL;
 }