log: Coverity REVERSE_INULL warnings

This commit addresses Coverity reported "REVERSE_INULL" warnings. Issue: 4699
4 years ago · 22e89ec4a3
parent e1c0725e05
commit 22e89ec4a3
1 changed files with 9 additions and 5 deletions
--- a/src/output-json.c
+++ b/src/output-json.c
@ -1099,8 +1099,7 @@ OutputInitResult OutputJsonInitCtx(ConfNode *conf)
    json_ctx->file_ctx = LogFileNewCtx();
    if (unlikely(json_ctx->file_ctx == NULL)) {
        SCLogDebug("AlertJsonInitCtx: Could not create new LogFileCtx");
-        SCFree(json_ctx);
-        return result;
+        goto error_exit;
    }

    if (sensor_name) {
@ -1238,11 +1237,16 @@ OutputInitResult OutputJsonInitCtx(ConfNode *conf)

 error_exit:
    if (json_ctx->file_ctx) {
+        if (json_ctx->file_ctx->prefix) {
+            SCFree(json_ctx->file_ctx->prefix);
+        }
+        if (json_ctx->file_ctx->sensor_name) {
+            SCFree(json_ctx->file_ctx->sensor_name);
+        }
        LogFileFreeCtx(json_ctx->file_ctx);
    }
-    if (json_ctx) {
-        SCFree(json_ctx);
-    }
+    SCFree(json_ctx);
+
    if (output_ctx) {
        SCFree(output_ctx);
    }