eve: threadinit/deinit callbacks are optional for filetypes

Only call ThreadInit and ThreadDeinit for custom eve filetypes if they exist. They are not required by all filetypes. Ticket: #7359
OISF · Nov 1, 2024 · b1e7917 · b1e7917
1 parent 292c218
commit b1e7917
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/output-json.c b/src/output-json.c
@@ -1050,9 +1050,11 @@ static int LogFileTypePrepare(
                     &json_ctx->file_ctx->filetype.init_data) < 0) {
             return -1;
         }
-        if (json_ctx->filetype->ThreadInit(json_ctx->file_ctx->filetype.init_data, 0,
-                    &json_ctx->file_ctx->filetype.thread_data) < 0) {
-            return -1;
+        if (json_ctx->filetype->ThreadInit) {
+            if (json_ctx->filetype->ThreadInit(json_ctx->file_ctx->filetype.init_data, 0,
+                        &json_ctx->file_ctx->filetype.thread_data) < 0) {
+                return -1;
+            }
         }
         json_ctx->file_ctx->filetype.filetype = json_ctx->filetype;
     }

diff --git a/src/util-logopenfile.c b/src/util-logopenfile.c
@@ -871,7 +871,7 @@ int LogFileFreeCtx(LogFileCtx *lf_ctx)
         SCReturnInt(0);
     }
 
-    if (lf_ctx->type == LOGFILE_TYPE_FILETYPE) {
+    if (lf_ctx->type == LOGFILE_TYPE_FILETYPE && lf_ctx->filetype.filetype->ThreadDeinit) {
         lf_ctx->filetype.filetype->ThreadDeinit(
                 lf_ctx->filetype.init_data, lf_ctx->filetype.thread_data);
     }