Reutilize the filename buffer and avoid malloc's

src/alert-unified-alert.c

@@ -106,10 +106,6 @@ int AlertUnifiedAlertWriteFileHeader(ThreadVars *t, AlertUnifiedAlertThread *aun
 int AlertUnifiedAlertCloseFile(ThreadVars *t, AlertUnifiedAlertThread *aun) {
     if (aun->file_ctx->fp != NULL) {
         fclose(aun->file_ctx->fp);
-        if (aun->file_ctx->filename != NULL) {
-            free(aun->file_ctx->filename);
-            aun->file_ctx->filename = NULL;
-        }
     }
     aun->size_current = 0;
 
@@ -284,7 +280,11 @@ LogFileCtx *AlertUnifiedAlertInitCtx(char *config_file)
  * */
 int AlertUnifiedAlertOpenFileCtx(LogFileCtx *file_ctx, char *config_file)
 {
-    char *filename = malloc(PATH_MAX); /* XXX some sane default? */
+    char *filename = NULL;
+    if (file_ctx->filename != NULL)
+        filename = file_ctx->filename;
+    else
+        filename = file_ctx->filename = malloc(PATH_MAX); /* XXX some sane default? */
 
     if (config_file == NULL) {
         /** Separate config files not implemented at the moment,
@@ -310,7 +310,6 @@ int AlertUnifiedAlertOpenFileCtx(LogFileCtx *file_ctx, char *config_file)
             printf("Error: fopen %s failed: %s\n", filename, strerror(errno)); /* XXX errno threadsafety? */
             return -1;
         }
-        file_ctx->filename = filename;
     }
 
     return 0;

src/alert-unified-log.c

@@ -110,10 +110,6 @@ int AlertUnifiedLogWriteFileHeader(ThreadVars *t, AlertUnifiedLogThread *aun) {
 int AlertUnifiedLogCloseFile(ThreadVars *t, AlertUnifiedLogThread *aun) {
     if (aun->file_ctx->fp != NULL) {
         fclose(aun->file_ctx->fp);
-        if (aun->file_ctx->filename != NULL) {
-            free(aun->file_ctx->filename);
-            aun->file_ctx->filename = NULL;
-        }
     }
     aun->size_current = 0;
     return 0;
@@ -301,7 +297,11 @@ LogFileCtx *AlertUnifiedLogInitCtx(char *config_file)
  * */
 int AlertUnifiedLogOpenFileCtx(LogFileCtx *file_ctx, char *config_file)
 {
-    char *filename = malloc(PATH_MAX); /* XXX some sane default? */
+    char *filename = NULL;
+    if (file_ctx->filename != NULL)
+        filename = file_ctx->filename;
+    else
+        filename = file_ctx->filename = malloc(PATH_MAX); /* XXX some sane default? */
 
     if(config_file == NULL)
     {
@@ -328,7 +328,6 @@ int AlertUnifiedLogOpenFileCtx(LogFileCtx *file_ctx, char *config_file)
             printf("Error: fopen %s failed: %s\n", filename, strerror(errno)); /* XXX errno threadsafety? */
             return -1;
         }
-        file_ctx->filename = filename;
     }
 
     return 0;

src/alert-unified2-alert.c

@@ -135,10 +135,6 @@ void TmModuleUnified2AlertRegister (void) {
 int Unified2AlertCloseFile(ThreadVars *t, Unified2AlertThread *aun) {
     if (aun->file_ctx->fp != NULL) {
         fclose(aun->file_ctx->fp);
-        if (aun->file_ctx->filename != NULL) {
-            free(aun->file_ctx->filename);
-            aun->file_ctx->filename = NULL;
-        }
     }
     aun->size_current = 0;
 
@@ -571,7 +567,11 @@ LogFileCtx *Unified2AlertInitCtx(char *config_file)
  * */
 int Unified2AlertOpenFileCtx(LogFileCtx *file_ctx, char *config_file)
 {
-    char *filename = malloc(PATH_MAX); /* XXX some sane default? */
+    char *filename = NULL;
+    if (file_ctx->filename != NULL)
+        filename = file_ctx->filename;
+    else
+        filename = file_ctx->filename = malloc(PATH_MAX); /* XXX some sane default? */
 
     if (config_file == NULL) {
         /** Separate config files not implemented at the moment,
@@ -597,7 +597,6 @@ int Unified2AlertOpenFileCtx(LogFileCtx *file_ctx, char *config_file)
             printf("Error: fopen %s failed: %s\n", filename, strerror(errno)); /* XXX errno threadsafety? */
             return -1;
         }
-        file_ctx->filename = filename;
     }
 
     return 0;